From 9a6859a5d9bf9dba82a6dca9bc87fa68adfb449d Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 17 Feb 2020 12:49:26 +0100
Subject: [PATCH] Refactor usages of TargetSpec parameter to target{} block.

TargetSpec is to be reduced to a reference to logical variable,
simplifying the feedback predicate.
When a node can be specified directly, use target{} block.
---
 .../models/controlflow.mps                    | 468 +++++++++---------
 .../jetbrains.mps.baseLanguageExt.types.mps   | 272 +++++-----
 2 files changed, 372 insertions(+), 368 deletions(-)

diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index 79a0f642..9168dfc8 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -269,7 +269,6 @@
       <concept id="4957570047283823112" name="jetbrains.mps.lang.coderules.structure.ProvideFeedbackConstraint" flags="ng" index="1lHd6T">
         <property id="4957570047283824112" name="severity" index="1lHdp1" />
         <child id="4957570047284421439" name="message" index="1ljv2e" />
-        <child id="1534124788593157769" name="target" index="3Gvizk" />
       </concept>
       <concept id="3575255234174969639" name="jetbrains.mps.lang.coderules.structure.ConstraintRule" flags="ng" index="1nLNMm">
         <child id="4814011019633607808" name="parameter" index="0Rg$4" />
@@ -317,8 +316,8 @@
         <reference id="7368070394767091750" name="template" index="3AqCNq" />
         <child id="7368070394768117915" name="argument" index="3AunhB" />
       </concept>
-      <concept id="1534124788594198142" name="jetbrains.mps.lang.coderules.structure.TargetSpec" flags="ng" index="3G3gwz">
-        <child id="1534124788594198166" name="code" index="3G3gzb" />
+      <concept id="1534124788579507963" name="jetbrains.mps.lang.coderules.structure.OriginSpec" flags="ng" index="3Hbl2A">
+        <child id="1534124788579511329" name="origin" index="3Hbm9W" />
       </concept>
       <concept id="2316688792938826204" name="jetbrains.mps.lang.coderules.structure.ConstraintLogicalClause" flags="ng" index="3I6s7M">
         <child id="2316688792938826214" name="constraint" index="3I6s78" />
@@ -1082,30 +1081,236 @@
                   </node>
                 </node>
                 <node concept="3clFbH" id="5YmBCzQNwLO" role="3cqZAp" />
-                <node concept="1nLNNL" id="5YmBCzQNbmV" role="3cqZAp">
-                  <node concept="1nLNMm" id="5YmBCzQNbmW" role="1nLNNK">
-                    <node concept="3Aq93q" id="5YmBCzQNbmX" role="1nLNMb">
-                      <property role="3ArMco" value="true" />
-                      <node concept="3I6sU6" id="5YmBCzQNbmY" role="3Ip0Jz">
-                        <node concept="3I6s7M" id="5YmBCzQNbmZ" role="3I6sU7">
-                          <node concept="3Aqt3T" id="5YmBCzQNbn0" role="3I6s78">
-                            <ref role="3AqCNq" node="78H58oeAof4" resolve="checkAll" />
+                <node concept="3Hbl2A" id="6tnA467V1uw" role="3cqZAp">
+                  <node concept="3clFbS" id="6tnA467V1uy" role="9aQI4">
+                    <node concept="1nLNNL" id="5YmBCzQNbmV" role="3cqZAp">
+                      <node concept="1nLNMm" id="5YmBCzQNbmW" role="1nLNNK">
+                        <node concept="3Aq93q" id="5YmBCzQNbmX" role="1nLNMb">
+                          <property role="3ArMco" value="true" />
+                          <node concept="3I6sU6" id="5YmBCzQNbmY" role="3Ip0Jz">
+                            <node concept="3I6s7M" id="5YmBCzQNbmZ" role="3I6sU7">
+                              <node concept="3Aqt3T" id="5YmBCzQNbn0" role="3I6s78">
+                                <ref role="3AqCNq" node="78H58oeAof4" resolve="checkAll" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3xSepi" id="6E2cNicdigK" role="3xSepv">
+                          <node concept="3Aq9E8" id="5YmBCzQNbn1" role="3xSepj">
+                            <node concept="3I6sU6" id="5YmBCzQNbn2" role="3Ip0Jz">
+                              <node concept="3I6s7M" id="5YmBCzQNbn3" role="3I6sU7">
+                                <node concept="3Aqt3T" id="5YmBCzQNbn4" role="3I6s78">
+                                  <ref role="3AqCNq" node="6Yb9hAqOFjy" resolve="unusedAssignment" />
+                                  <node concept="37jhX" id="1TH_SRmhrql" role="3AunhB">
+                                    <node concept="2OqwBi" id="1TH_SRlXDgr" role="37jj2">
+                                      <node concept="37vLTw" id="5YmBCzQNwMZ" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
+                                      </node>
+                                      <node concept="iZEcu" id="1TH_SRlXDgs" role="2OqNvi" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="3xSepi" id="6E2cNicdigK" role="3xSepv">
-                      <node concept="3Aq9E8" id="5YmBCzQNbn1" role="3xSepj">
-                        <node concept="3I6sU6" id="5YmBCzQNbn2" role="3Ip0Jz">
-                          <node concept="3I6s7M" id="5YmBCzQNbn3" role="3I6sU7">
-                            <node concept="3Aqt3T" id="5YmBCzQNbn4" role="3I6s78">
-                              <ref role="3AqCNq" node="6Yb9hAqOFjy" resolve="unusedAssignment" />
-                              <node concept="37jhX" id="1TH_SRmhrql" role="3AunhB">
-                                <node concept="2OqwBi" id="1TH_SRlXDgr" role="37jj2">
-                                  <node concept="37vLTw" id="5YmBCzQNwMZ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
+                    <node concept="3clFbH" id="2Uh$R6pDymb" role="3cqZAp" />
+                    <node concept="1nLNNL" id="5YmBCzQNbn8" role="3cqZAp">
+                      <node concept="1nLNMm" id="5YmBCzQNbn9" role="1nLNNK">
+                        <node concept="3Aq93q" id="FAZzzipfJn" role="1nLNMb">
+                          <property role="3ArMco" value="true" />
+                          <node concept="3I6sU6" id="FAZzzipfJo" role="3Ip0Jz">
+                            <node concept="3I6s7M" id="FAZzzipfKi" role="3I6sU7">
+                              <node concept="3Aqt3T" id="FAZzzipfKh" role="3I6s78">
+                                <ref role="3AqCNq" node="7pxta7vrjE$" resolve="live" />
+                                <node concept="37jhX" id="1TH_SRmhrqm" role="3AunhB">
+                                  <node concept="2OqwBi" id="1TH_SRlXDgt" role="37jj2">
+                                    <node concept="2OqwBi" id="5pIcDR7Ll7V" role="2Oq$k0">
+                                      <node concept="3A2sRY" id="FAZzzipfKt" role="2Oq$k0">
+                                        <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
+                                      </node>
+                                      <node concept="3TrEf2" id="5pIcDR7LlBA" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
+                                      </node>
+                                    </node>
+                                    <node concept="iZEcu" id="1TH_SRlXDgu" role="2OqNvi" />
+                                  </node>
+                                </node>
+                                <node concept="37jhX" id="1TH_SRmhrqn" role="3AunhB">
+                                  <node concept="2OqwBi" id="1TH_SRlXDgv" role="37jj2">
+                                    <node concept="3A2sRY" id="5pIcDR7LlBU" role="2Oq$k0">
+                                      <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
+                                    </node>
+                                    <node concept="iZEcu" id="1TH_SRlXDgw" role="2OqNvi" />
+                                  </node>
+                                </node>
+                                <node concept="a7P8L" id="5pIcDR7JNl5" role="3AunhB">
+                                  <ref role="a7OzE" node="5pIcDR7JNkR" resolve="RSite" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3Aq93q" id="5YmBCzQNbnp" role="1nLNMb">
+                          <property role="3ArMco" value="false" />
+                          <node concept="3I6sU6" id="5YmBCzQNbnq" role="3Ip0Jz">
+                            <node concept="3I6s7M" id="5YmBCzQNbnr" role="3I6sU7">
+                              <node concept="3Aqt3T" id="5YmBCzQNbns" role="3I6s78">
+                                <ref role="3AqCNq" node="6Yb9hAqOFjy" resolve="unusedAssignment" />
+                                <node concept="37jhX" id="1TH_SRmhrqo" role="3AunhB">
+                                  <node concept="2OqwBi" id="1TH_SRlXDgx" role="37jj2">
+                                    <node concept="37vLTw" id="5YmBCzQNwN6" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
+                                    </node>
+                                    <node concept="iZEcu" id="1TH_SRlXDgy" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3Aq9_M" id="5pIcDR7JNlH" role="1nLNMa">
+                          <node concept="3I6sU6" id="5pIcDR7JNlI" role="3Ip0Jz">
+                            <node concept="3I6s7M" id="5pIcDR7JNlM" role="3I6sU7">
+                              <node concept="2aLmEc" id="5pIcDR7JNlL" role="3I6s78">
+                                <node concept="a7P8L" id="5pIcDR7JNlR" role="2aLmnP">
+                                  <ref role="a7OzE" node="5pIcDR7JNkR" resolve="RSite" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3NuqgR" id="5pIcDR7JNkN" role="0Rg$4">
+                          <node concept="aZer4" id="5pIcDR7JNkR" role="3XD1gS">
+                            <property role="TrG5h" value="RSite" />
+                          </node>
+                          <node concept="aZer4" id="5pIcDR7JNkU" role="3XD1gS">
+                            <property role="TrG5h" value="Node" />
+                          </node>
+                          <node concept="32pEOW" id="24ciDNzxNAf" role="3vLBG7" />
+                        </node>
+                        <node concept="3xSepi" id="6E2cNicdigL" role="3xSepv">
+                          <node concept="3Aq9E8" id="FAZzzit0x0" role="3xSepj">
+                            <node concept="3I6sU6" id="FAZzzit0x1" role="3Ip0Jz">
+                              <node concept="3I6s7M" id="1laj_RU7RGh" role="3I6sU7">
+                                <node concept="1lHd6T" id="1laj_RU7RGg" role="3I6s78">
+                                  <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
+                                  <node concept="Xl_RD" id="1laj_RU7RGq" role="1ljv2e">
+                                    <property role="Xl_RC" value="unused assignment" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="5YmBCzQNbnz" role="3cqZAp" />
+                    <node concept="1nLNNL" id="FAZzzit0vz" role="3cqZAp">
+                      <node concept="1nLNMm" id="FAZzzit0v$" role="1nLNNK">
+                        <node concept="3Aq93q" id="FAZzzit0v_" role="1nLNMb">
+                          <property role="3ArMco" value="true" />
+                          <node concept="3I6sU6" id="FAZzzit0vA" role="3Ip0Jz">
+                            <node concept="3I6s7M" id="5pIcDR7JNm2" role="3I6sU7">
+                              <node concept="3Aqt3T" id="5pIcDR7JNm3" role="3I6s78">
+                                <ref role="3AqCNq" node="7pxta7vrjE$" resolve="live" />
+                                <node concept="37jhX" id="1TH_SRmhrqp" role="3AunhB">
+                                  <node concept="2OqwBi" id="1TH_SRlXDgz" role="37jj2">
+                                    <node concept="2OqwBi" id="5pIcDR7LlLI" role="2Oq$k0">
+                                      <node concept="3A2sRY" id="5pIcDR7JNm5" role="2Oq$k0">
+                                        <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
+                                      </node>
+                                      <node concept="3TrEf2" id="5pIcDR7Lmht" role="2OqNvi">
+                                        <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
+                                      </node>
+                                    </node>
+                                    <node concept="iZEcu" id="1TH_SRlXDg$" role="2OqNvi" />
+                                  </node>
+                                </node>
+                                <node concept="37jhX" id="1TH_SRmhrqq" role="3AunhB">
+                                  <node concept="2OqwBi" id="1TH_SRlXDg_" role="37jj2">
+                                    <node concept="3A2sRY" id="5pIcDR7LmhG" role="2Oq$k0">
+                                      <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
+                                    </node>
+                                    <node concept="iZEcu" id="1TH_SRlXDgA" role="2OqNvi" />
+                                  </node>
+                                </node>
+                                <node concept="a7P8L" id="5pIcDR7JNm7" role="3AunhB">
+                                  <ref role="a7OzE" node="5TXeSYSFOYf" resolve="RSite" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3Aq93q" id="FAZzzit0vF" role="1nLNMb">
+                          <property role="3ArMco" value="false" />
+                          <node concept="3I6sU6" id="FAZzzit0vG" role="3Ip0Jz">
+                            <node concept="3I6s7M" id="FAZzzit0vH" role="3I6sU7">
+                              <node concept="3Aqt3T" id="FAZzzit0vI" role="3I6s78">
+                                <ref role="3AqCNq" node="6Yb9hAqOFjy" resolve="unusedAssignment" />
+                                <node concept="37jhX" id="1TH_SRmhrqr" role="3AunhB">
+                                  <node concept="2OqwBi" id="1TH_SRlXDgB" role="37jj2">
+                                    <node concept="37vLTw" id="FAZzzit0vK" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
+                                    </node>
+                                    <node concept="iZEcu" id="1TH_SRlXDgC" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3Aq9_M" id="5pIcDR7JNmm" role="1nLNMa">
+                          <node concept="3I6sU6" id="5pIcDR7JNmn" role="3Ip0Jz">
+                            <node concept="3I6s7M" id="5pIcDR7JNmr" role="3I6sU7">
+                              <node concept="2aM9Np" id="5pIcDR7JNmq" role="3I6s78">
+                                <node concept="a7P8L" id="5pIcDR7JNVs" role="2aLmnP">
+                                  <ref role="a7OzE" node="5TXeSYSFOYf" resolve="RSite" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3NuqgR" id="5TXeSYSFOYe" role="0Rg$4">
+                          <node concept="aZer4" id="5TXeSYSFOYf" role="3XD1gS">
+                            <property role="TrG5h" value="RSite" />
+                          </node>
+                          <node concept="32pEOW" id="24ciDNzxNAg" role="3vLBG7" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="5YmBCzQNbn7" role="3cqZAp" />
+                    <node concept="1nLNNL" id="5YmBCzQNbn$" role="3cqZAp">
+                      <node concept="1nLNMm" id="5YmBCzQNbn_" role="1nLNNK">
+                        <node concept="3Aq93q" id="5YmBCzQNbnA" role="1nLNMb">
+                          <property role="3ArMco" value="true" />
+                          <node concept="3I6sU6" id="5YmBCzQNbnB" role="3Ip0Jz">
+                            <node concept="3I6s7M" id="5YmBCzQNbnC" role="3I6sU7">
+                              <node concept="3Aqt3T" id="5YmBCzQNbnD" role="3I6s78">
+                                <ref role="3AqCNq" node="6Yb9hAqOFjy" resolve="unusedAssignment" />
+                                <node concept="37jhX" id="1TH_SRmhrqs" role="3AunhB">
+                                  <node concept="2OqwBi" id="1TH_SRlXDgD" role="37jj2">
+                                    <node concept="37vLTw" id="5YmBCzQNwNd" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
+                                    </node>
+                                    <node concept="iZEcu" id="1TH_SRlXDgE" role="2OqNvi" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3xSepi" id="6E2cNicdigM" role="3xSepv">
+                          <node concept="3Aq9E8" id="5YmBCzQNbnG" role="3xSepj">
+                            <node concept="3I6sU6" id="5YmBCzQNbnH" role="3Ip0Jz">
+                              <node concept="3I6s7M" id="1laj_RU7RT4" role="3I6sU7">
+                                <node concept="1lHd6T" id="1laj_RU7RT3" role="3I6s78">
+                                  <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
+                                  <node concept="Xl_RD" id="1laj_RU7RTd" role="1ljv2e">
+                                    <property role="Xl_RC" value="unused assignment" />
                                   </node>
-                                  <node concept="iZEcu" id="1TH_SRlXDgs" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
@@ -1114,223 +1319,8 @@
                       </node>
                     </node>
                   </node>
-                </node>
-                <node concept="3clFbH" id="2Uh$R6pDymb" role="3cqZAp" />
-                <node concept="1nLNNL" id="5YmBCzQNbn8" role="3cqZAp">
-                  <node concept="1nLNMm" id="5YmBCzQNbn9" role="1nLNNK">
-                    <node concept="3Aq93q" id="FAZzzipfJn" role="1nLNMb">
-                      <property role="3ArMco" value="true" />
-                      <node concept="3I6sU6" id="FAZzzipfJo" role="3Ip0Jz">
-                        <node concept="3I6s7M" id="FAZzzipfKi" role="3I6sU7">
-                          <node concept="3Aqt3T" id="FAZzzipfKh" role="3I6s78">
-                            <ref role="3AqCNq" node="7pxta7vrjE$" resolve="live" />
-                            <node concept="37jhX" id="1TH_SRmhrqm" role="3AunhB">
-                              <node concept="2OqwBi" id="1TH_SRlXDgt" role="37jj2">
-                                <node concept="2OqwBi" id="5pIcDR7Ll7V" role="2Oq$k0">
-                                  <node concept="3A2sRY" id="FAZzzipfKt" role="2Oq$k0">
-                                    <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                                  </node>
-                                  <node concept="3TrEf2" id="5pIcDR7LlBA" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
-                                  </node>
-                                </node>
-                                <node concept="iZEcu" id="1TH_SRlXDgu" role="2OqNvi" />
-                              </node>
-                            </node>
-                            <node concept="37jhX" id="1TH_SRmhrqn" role="3AunhB">
-                              <node concept="2OqwBi" id="1TH_SRlXDgv" role="37jj2">
-                                <node concept="3A2sRY" id="5pIcDR7LlBU" role="2Oq$k0">
-                                  <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                                </node>
-                                <node concept="iZEcu" id="1TH_SRlXDgw" role="2OqNvi" />
-                              </node>
-                            </node>
-                            <node concept="a7P8L" id="5pIcDR7JNl5" role="3AunhB">
-                              <ref role="a7OzE" node="5pIcDR7JNkR" resolve="RSite" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3Aq93q" id="5YmBCzQNbnp" role="1nLNMb">
-                      <property role="3ArMco" value="false" />
-                      <node concept="3I6sU6" id="5YmBCzQNbnq" role="3Ip0Jz">
-                        <node concept="3I6s7M" id="5YmBCzQNbnr" role="3I6sU7">
-                          <node concept="3Aqt3T" id="5YmBCzQNbns" role="3I6s78">
-                            <ref role="3AqCNq" node="6Yb9hAqOFjy" resolve="unusedAssignment" />
-                            <node concept="37jhX" id="1TH_SRmhrqo" role="3AunhB">
-                              <node concept="2OqwBi" id="1TH_SRlXDgx" role="37jj2">
-                                <node concept="37vLTw" id="5YmBCzQNwN6" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
-                                </node>
-                                <node concept="iZEcu" id="1TH_SRlXDgy" role="2OqNvi" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3Aq9_M" id="5pIcDR7JNlH" role="1nLNMa">
-                      <node concept="3I6sU6" id="5pIcDR7JNlI" role="3Ip0Jz">
-                        <node concept="3I6s7M" id="5pIcDR7JNlM" role="3I6sU7">
-                          <node concept="2aLmEc" id="5pIcDR7JNlL" role="3I6s78">
-                            <node concept="a7P8L" id="5pIcDR7JNlR" role="2aLmnP">
-                              <ref role="a7OzE" node="5pIcDR7JNkR" resolve="RSite" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3NuqgR" id="5pIcDR7JNkN" role="0Rg$4">
-                      <node concept="aZer4" id="5pIcDR7JNkR" role="3XD1gS">
-                        <property role="TrG5h" value="RSite" />
-                      </node>
-                      <node concept="aZer4" id="5pIcDR7JNkU" role="3XD1gS">
-                        <property role="TrG5h" value="Node" />
-                      </node>
-                      <node concept="32pEOW" id="24ciDNzxNAf" role="3vLBG7" />
-                    </node>
-                    <node concept="3xSepi" id="6E2cNicdigL" role="3xSepv">
-                      <node concept="3Aq9E8" id="FAZzzit0x0" role="3xSepj">
-                        <node concept="3I6sU6" id="FAZzzit0x1" role="3Ip0Jz">
-                          <node concept="3I6s7M" id="1laj_RU7RGh" role="3I6sU7">
-                            <node concept="1lHd6T" id="1laj_RU7RGg" role="3I6s78">
-                              <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
-                              <node concept="Xl_RD" id="1laj_RU7RGq" role="1ljv2e">
-                                <property role="Xl_RC" value="unused assignment" />
-                              </node>
-                              <node concept="3G3gwz" id="1laj_RU7RGv" role="3Gvizk">
-                                <node concept="2OqwBi" id="1laj_RU7RN5" role="3G3gzb">
-                                  <node concept="37vLTw" id="1laj_RU7RGz" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
-                                  </node>
-                                  <node concept="iZEcu" id="1laj_RU7RSE" role="2OqNvi" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="5YmBCzQNbnz" role="3cqZAp" />
-                <node concept="1nLNNL" id="FAZzzit0vz" role="3cqZAp">
-                  <node concept="1nLNMm" id="FAZzzit0v$" role="1nLNNK">
-                    <node concept="3Aq93q" id="FAZzzit0v_" role="1nLNMb">
-                      <property role="3ArMco" value="true" />
-                      <node concept="3I6sU6" id="FAZzzit0vA" role="3Ip0Jz">
-                        <node concept="3I6s7M" id="5pIcDR7JNm2" role="3I6sU7">
-                          <node concept="3Aqt3T" id="5pIcDR7JNm3" role="3I6s78">
-                            <ref role="3AqCNq" node="7pxta7vrjE$" resolve="live" />
-                            <node concept="37jhX" id="1TH_SRmhrqp" role="3AunhB">
-                              <node concept="2OqwBi" id="1TH_SRlXDgz" role="37jj2">
-                                <node concept="2OqwBi" id="5pIcDR7LlLI" role="2Oq$k0">
-                                  <node concept="3A2sRY" id="5pIcDR7JNm5" role="2Oq$k0">
-                                    <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                                  </node>
-                                  <node concept="3TrEf2" id="5pIcDR7Lmht" role="2OqNvi">
-                                    <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
-                                  </node>
-                                </node>
-                                <node concept="iZEcu" id="1TH_SRlXDg$" role="2OqNvi" />
-                              </node>
-                            </node>
-                            <node concept="37jhX" id="1TH_SRmhrqq" role="3AunhB">
-                              <node concept="2OqwBi" id="1TH_SRlXDg_" role="37jj2">
-                                <node concept="3A2sRY" id="5pIcDR7LmhG" role="2Oq$k0">
-                                  <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                                </node>
-                                <node concept="iZEcu" id="1TH_SRlXDgA" role="2OqNvi" />
-                              </node>
-                            </node>
-                            <node concept="a7P8L" id="5pIcDR7JNm7" role="3AunhB">
-                              <ref role="a7OzE" node="5TXeSYSFOYf" resolve="RSite" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3Aq93q" id="FAZzzit0vF" role="1nLNMb">
-                      <property role="3ArMco" value="false" />
-                      <node concept="3I6sU6" id="FAZzzit0vG" role="3Ip0Jz">
-                        <node concept="3I6s7M" id="FAZzzit0vH" role="3I6sU7">
-                          <node concept="3Aqt3T" id="FAZzzit0vI" role="3I6s78">
-                            <ref role="3AqCNq" node="6Yb9hAqOFjy" resolve="unusedAssignment" />
-                            <node concept="37jhX" id="1TH_SRmhrqr" role="3AunhB">
-                              <node concept="2OqwBi" id="1TH_SRlXDgB" role="37jj2">
-                                <node concept="37vLTw" id="FAZzzit0vK" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
-                                </node>
-                                <node concept="iZEcu" id="1TH_SRlXDgC" role="2OqNvi" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3Aq9_M" id="5pIcDR7JNmm" role="1nLNMa">
-                      <node concept="3I6sU6" id="5pIcDR7JNmn" role="3Ip0Jz">
-                        <node concept="3I6s7M" id="5pIcDR7JNmr" role="3I6sU7">
-                          <node concept="2aM9Np" id="5pIcDR7JNmq" role="3I6s78">
-                            <node concept="a7P8L" id="5pIcDR7JNVs" role="2aLmnP">
-                              <ref role="a7OzE" node="5TXeSYSFOYf" resolve="RSite" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3NuqgR" id="5TXeSYSFOYe" role="0Rg$4">
-                      <node concept="aZer4" id="5TXeSYSFOYf" role="3XD1gS">
-                        <property role="TrG5h" value="RSite" />
-                      </node>
-                      <node concept="32pEOW" id="24ciDNzxNAg" role="3vLBG7" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="5YmBCzQNbn7" role="3cqZAp" />
-                <node concept="1nLNNL" id="5YmBCzQNbn$" role="3cqZAp">
-                  <node concept="1nLNMm" id="5YmBCzQNbn_" role="1nLNNK">
-                    <node concept="3Aq93q" id="5YmBCzQNbnA" role="1nLNMb">
-                      <property role="3ArMco" value="true" />
-                      <node concept="3I6sU6" id="5YmBCzQNbnB" role="3Ip0Jz">
-                        <node concept="3I6s7M" id="5YmBCzQNbnC" role="3I6sU7">
-                          <node concept="3Aqt3T" id="5YmBCzQNbnD" role="3I6s78">
-                            <ref role="3AqCNq" node="6Yb9hAqOFjy" resolve="unusedAssignment" />
-                            <node concept="37jhX" id="1TH_SRmhrqs" role="3AunhB">
-                              <node concept="2OqwBi" id="1TH_SRlXDgD" role="37jj2">
-                                <node concept="37vLTw" id="5YmBCzQNwNd" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
-                                </node>
-                                <node concept="iZEcu" id="1TH_SRlXDgE" role="2OqNvi" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3xSepi" id="6E2cNicdigM" role="3xSepv">
-                      <node concept="3Aq9E8" id="5YmBCzQNbnG" role="3xSepj">
-                        <node concept="3I6sU6" id="5YmBCzQNbnH" role="3Ip0Jz">
-                          <node concept="3I6s7M" id="1laj_RU7RT4" role="3I6sU7">
-                            <node concept="1lHd6T" id="1laj_RU7RT3" role="3I6s78">
-                              <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
-                              <node concept="Xl_RD" id="1laj_RU7RTd" role="1ljv2e">
-                                <property role="Xl_RC" value="unused assignment" />
-                              </node>
-                              <node concept="3G3gwz" id="1laj_RU7RTi" role="3Gvizk">
-                                <node concept="2OqwBi" id="1laj_RU7RZS" role="3G3gzb">
-                                  <node concept="37vLTw" id="1laj_RU7RTm" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
-                                  </node>
-                                  <node concept="iZEcu" id="1laj_RU7S5t" role="2OqNvi" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
+                  <node concept="37vLTw" id="6tnA467V1wz" role="3Hbm9W">
+                    <ref role="3cqZAo" node="5YmBCzQNw$K" resolve="parent" />
                   </node>
                 </node>
                 <node concept="3clFbH" id="5YmBCzQLxAx" role="3cqZAp" />
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 4fa6127c..04cbcccf 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
@@ -12643,7 +12643,7 @@
                   </node>
                 </node>
               </node>
-              <node concept="37vLTw" id="1laj_RSrVCA" role="3Hbm9W">
+              <node concept="37vLTw" id="6tnA466S7Vf" role="3Hbm9W">
                 <ref role="3cqZAo" node="1Py6iKTFGZ" resolve="expr" />
               </node>
             </node>
@@ -38426,46 +38426,42 @@
                   </node>
                 </node>
                 <node concept="3clFbH" id="58JqeLuYce1" role="3cqZAp" />
-                <node concept="1nLNNL" id="3sbALnUgerM" role="3cqZAp">
-                  <node concept="1nLNMm" id="3sbALnUgerO" role="1nLNNK">
-                    <node concept="3Aq93q" id="3sbALnUgeBh" role="1nLNMb">
-                      <property role="3ArMco" value="true" />
-                      <node concept="3I6sU6" id="3sbALnUgeBi" role="3Ip0Jz">
-                        <node concept="3I6s7M" id="3sbALnUgeIW" role="3I6sU7">
-                          <node concept="3Aqt3T" id="3sbALnUgeIV" role="3I6s78">
-                            <ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3xSepi" id="6E2cNicdilg" role="3xSepv">
-                      <node concept="3Aq9E8" id="3sbALnUgi3U" role="3xSepj">
-                        <node concept="3I6sU6" id="3sbALnUgi3V" role="3Ip0Jz">
-                          <node concept="3I6s7M" id="3sbALnUgeUu" role="3I6sU7">
-                            <node concept="3wWvb2" id="3sbALnUgeUt" role="3I6s78">
-                              <node concept="37vLTw" id="58JqeLuYc7B" role="3wWo3s">
-                                <ref role="3cqZAo" node="58JqeLuYc7x" resolve="dimOk" />
+                <node concept="3Hbl2A" id="6tnA467V1OW" role="3cqZAp">
+                  <node concept="3clFbS" id="6tnA467V1OY" role="9aQI4">
+                    <node concept="1nLNNL" id="3sbALnUgerM" role="3cqZAp">
+                      <node concept="1nLNMm" id="3sbALnUgerO" role="1nLNNK">
+                        <node concept="3Aq93q" id="3sbALnUgeBh" role="1nLNMb">
+                          <property role="3ArMco" value="true" />
+                          <node concept="3I6sU6" id="3sbALnUgeBi" role="3Ip0Jz">
+                            <node concept="3I6s7M" id="3sbALnUgeIW" role="3I6sU7">
+                              <node concept="3Aqt3T" id="3sbALnUgeIV" role="3I6s78">
+                                <ref role="3AqCNq" node="34$A1MfabR$" resolve="checkAll" />
                               </node>
                             </node>
                           </node>
                         </node>
-                      </node>
-                    </node>
-                    <node concept="3xSepi" id="6E2cNicdilh" role="3xSepv">
-                      <node concept="3Aq9E8" id="3sbALnUgeMM" role="3xSepj">
-                        <node concept="3I6sU6" id="3sbALnUgeMN" role="3Ip0Jz">
-                          <node concept="3I6s7M" id="3sbALnUgkiM" role="3I6sU7">
-                            <node concept="1lHd6T" id="PltxfHBdXG" role="3I6s78">
-                              <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
-                              <node concept="Xl_RD" id="3sbALnUgkPW" role="1ljv2e">
-                                <property role="Xl_RC" value="Dimension must not be specified here" />
-                              </node>
-                              <node concept="3G3gwz" id="PltxfHBdXM" role="3Gvizk">
-                                <node concept="2OqwBi" id="PltxfHCRok" role="3G3gzb">
-                                  <node concept="37vLTw" id="PltxfHBdXQ" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3sbALnUgj0h" resolve="dim" />
+                        <node concept="3xSepi" id="6E2cNicdilg" role="3xSepv">
+                          <node concept="3Aq9E8" id="3sbALnUgi3U" role="3xSepj">
+                            <node concept="3I6sU6" id="3sbALnUgi3V" role="3Ip0Jz">
+                              <node concept="3I6s7M" id="3sbALnUgeUu" role="3I6sU7">
+                                <node concept="3wWvb2" id="3sbALnUgeUt" role="3I6s78">
+                                  <node concept="37vLTw" id="58JqeLuYc7B" role="3wWo3s">
+                                    <ref role="3cqZAo" node="58JqeLuYc7x" resolve="dimOk" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3xSepi" id="6E2cNicdilh" role="3xSepv">
+                          <node concept="3Aq9E8" id="3sbALnUgeMM" role="3xSepj">
+                            <node concept="3I6sU6" id="3sbALnUgeMN" role="3Ip0Jz">
+                              <node concept="3I6s7M" id="3sbALnUgkiM" role="3I6sU7">
+                                <node concept="1lHd6T" id="PltxfHBdXG" role="3I6s78">
+                                  <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
+                                  <node concept="Xl_RD" id="3sbALnUgkPW" role="1ljv2e">
+                                    <property role="Xl_RC" value="Dimension must not be specified here" />
                                   </node>
-                                  <node concept="iZEcu" id="PltxfHCRv1" role="2OqNvi" />
                                 </node>
                               </node>
                             </node>
@@ -38474,6 +38470,9 @@
                       </node>
                     </node>
                   </node>
+                  <node concept="37vLTw" id="6tnA467V1PG" role="3Hbm9W">
+                    <ref role="3cqZAo" node="3sbALnUgj0h" resolve="dim" />
+                  </node>
                 </node>
               </node>
               <node concept="3cpWsn" id="3sbALnUgbVf" role="1Duv9x">
@@ -38578,14 +38577,6 @@
                       <node concept="Xl_RD" id="1OEgqtpyryr" role="1ljv2e">
                         <property role="Xl_RC" value="Array initializer or dimension expected" />
                       </node>
-                      <node concept="3G3gwz" id="PltxfHBeji" role="3Gvizk">
-                        <node concept="2OqwBi" id="PltxfHCRAV" role="3G3gzb">
-                          <node concept="3A2sRY" id="PltxfHBejy" role="2Oq$k0">
-                            <ref role="3A2yKK" node="pupwRqISwM" resolve="arrc" />
-                          </node>
-                          <node concept="iZEcu" id="PltxfHCRNs" role="2OqNvi" />
-                        </node>
-                      </node>
                     </node>
                   </node>
                 </node>
@@ -45247,110 +45238,133 @@
       <node concept="3clFbS" id="5mvKPwwqDjV" role="1nLNMH">
         <node concept="3clFbJ" id="5mvKPwwqNK9" role="3cqZAp">
           <node concept="3clFbS" id="5mvKPwwqNKb" role="3clFbx">
-            <node concept="1nLNNL" id="5mvKPwwqEMH" role="3cqZAp">
-              <node concept="1nLNMm" id="5mvKPwwqEMJ" role="1nLNNK">
-                <node concept="3Aq93q" id="5mvKPwwqEYc" role="1nLNMb">
-                  <property role="3ArMco" value="true" />
-                  <node concept="3I6sU6" id="5mvKPwwqEYd" role="3Ip0Jz">
-                    <node concept="3I6s7M" id="5mvKPwwqF24" role="3I6sU7">
-                      <node concept="3Aqt3T" id="5mvKPwwqF23" role="3I6s78">
-                        <ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkGenerics" />
-                      </node>
+            <node concept="1DcWWT" id="6tnA4688W4q" role="3cqZAp">
+              <node concept="3clFbS" id="6tnA4688W4r" role="2LFqv$">
+                <node concept="3SKdUt" id="6tnA4688W4s" role="3cqZAp">
+                  <node concept="1PaTwC" id="6tnA4688W4t" role="3ndbpf">
+                    <node concept="3oM_SD" id="6tnA4688W4u" role="1PaTwD">
+                      <property role="3oM_SC" value="auxiliary" />
+                    </node>
+                    <node concept="3oM_SD" id="6tnA4688W4v" role="1PaTwD">
+                      <property role="3oM_SC" value="bounds" />
+                    </node>
+                    <node concept="3oM_SD" id="6tnA4688W4w" role="1PaTwD">
+                      <property role="3oM_SC" value="must" />
+                    </node>
+                    <node concept="3oM_SD" id="6tnA4688W4x" role="1PaTwD">
+                      <property role="3oM_SC" value="be" />
+                    </node>
+                    <node concept="3oM_SD" id="6tnA4688W4y" role="1PaTwD">
+                      <property role="3oM_SC" value="interfaces" />
+                    </node>
+                    <node concept="3oM_SD" id="6tnA4688W4z" role="1PaTwD">
+                      <property role="3oM_SC" value="according" />
+                    </node>
+                    <node concept="3oM_SD" id="6tnA4688W4$" role="1PaTwD">
+                      <property role="3oM_SC" value="to" />
+                    </node>
+                    <node concept="3oM_SD" id="6tnA4688W4_" role="1PaTwD">
+                      <property role="3oM_SC" value="JLS" />
                     </node>
                   </node>
                 </node>
-                <node concept="3xSepi" id="6E2cNicdimb" role="3xSepv">
-                  <node concept="3Aq9E8" id="5mvKPwwqF9H" role="3xSepj">
-                    <node concept="3I6sU6" id="5mvKPwwqF9I" role="3Ip0Jz">
-                      <node concept="3IrJb3" id="5mvKPwwqFd$" role="3I6sU7">
-                        <node concept="3clFbS" id="5mvKPwwqFd_" role="3IrJb0">
-                          <node concept="1DcWWT" id="5mvKPwwqGxg" role="3cqZAp">
-                            <node concept="3clFbS" id="5mvKPwwqGxh" role="2LFqv$">
-                              <node concept="3SKdUt" id="5mvKPwwqGxv" role="3cqZAp">
-                                <node concept="1PaTwC" id="5mvKPwwqGxw" role="3ndbpf">
-                                  <node concept="3oM_SD" id="5mvKPwwqGxx" role="1PaTwD">
-                                    <property role="3oM_SC" value="auxiliary" />
-                                  </node>
-                                  <node concept="3oM_SD" id="5mvKPwwqGxy" role="1PaTwD">
-                                    <property role="3oM_SC" value="bounds" />
-                                  </node>
-                                  <node concept="3oM_SD" id="5mvKPwwqGxz" role="1PaTwD">
-                                    <property role="3oM_SC" value="must" />
-                                  </node>
-                                  <node concept="3oM_SD" id="5mvKPwwqGx$" role="1PaTwD">
-                                    <property role="3oM_SC" value="be" />
-                                  </node>
-                                  <node concept="3oM_SD" id="5mvKPwwqGx_" role="1PaTwD">
-                                    <property role="3oM_SC" value="interfaces" />
-                                  </node>
-                                  <node concept="3oM_SD" id="5mvKPwwqGxA" role="1PaTwD">
-                                    <property role="3oM_SC" value="according" />
-                                  </node>
-                                  <node concept="3oM_SD" id="5mvKPwwqGxB" role="1PaTwD">
-                                    <property role="3oM_SC" value="to" />
-                                  </node>
-                                  <node concept="3oM_SD" id="5mvKPwwqGxC" role="1PaTwD">
-                                    <property role="3oM_SC" value="JLS" />
+                <node concept="3clFbJ" id="6tnA4688W4A" role="3cqZAp">
+                  <node concept="3clFbS" id="6tnA4688W4B" role="3clFbx">
+                    <node concept="3SKdUt" id="5mvKPwwqGxv" role="3cqZAp">
+                      <node concept="1PaTwC" id="5mvKPwwqGxw" role="3ndbpf">
+                        <node concept="3oM_SD" id="5mvKPwwqGxx" role="1PaTwD">
+                          <property role="3oM_SC" value="auxiliary" />
+                        </node>
+                        <node concept="3oM_SD" id="5mvKPwwqGxy" role="1PaTwD">
+                          <property role="3oM_SC" value="bounds" />
+                        </node>
+                        <node concept="3oM_SD" id="5mvKPwwqGxz" role="1PaTwD">
+                          <property role="3oM_SC" value="must" />
+                        </node>
+                        <node concept="3oM_SD" id="5mvKPwwqGx$" role="1PaTwD">
+                          <property role="3oM_SC" value="be" />
+                        </node>
+                        <node concept="3oM_SD" id="5mvKPwwqGx_" role="1PaTwD">
+                          <property role="3oM_SC" value="interfaces" />
+                        </node>
+                        <node concept="3oM_SD" id="5mvKPwwqGxA" role="1PaTwD">
+                          <property role="3oM_SC" value="according" />
+                        </node>
+                        <node concept="3oM_SD" id="5mvKPwwqGxB" role="1PaTwD">
+                          <property role="3oM_SC" value="to" />
+                        </node>
+                        <node concept="3oM_SD" id="5mvKPwwqGxC" role="1PaTwD">
+                          <property role="3oM_SC" value="JLS" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3Hbl2A" id="6tnA46891zv" role="3cqZAp">
+                      <node concept="3clFbS" id="6tnA46891zx" role="9aQI4">
+                        <node concept="1nLNNL" id="6tnA46891z7" role="3cqZAp">
+                          <node concept="1nLNMm" id="6tnA46891z9" role="1nLNNK">
+                            <node concept="3Aq93q" id="6tnA46891ze" role="1nLNMb">
+                              <property role="3ArMco" value="true" />
+                              <node concept="3I6sU6" id="6tnA46891zf" role="3Ip0Jz">
+                                <node concept="3I6s7M" id="6tnA46891zj" role="3I6sU7">
+                                  <node concept="3Aqt3T" id="6tnA46891zi" role="3I6s78">
+                                    <ref role="3AqCNq" node="4btN1w5Ki4T" resolve="checkGenerics" />
                                   </node>
                                 </node>
                               </node>
-                              <node concept="3clFbJ" id="5mvKPwwqGxD" role="3cqZAp">
-                                <node concept="3clFbS" id="5mvKPwwqGxE" role="3clFbx">
-                                  <node concept="3Aqczg" id="5mvKPwwqGxF" role="3cqZAp">
-                                    <node concept="1lHd6T" id="5mvKPwwqGxG" role="3Aqpz8">
+                            </node>
+                            <node concept="3xSepi" id="6tnA46891HA" role="3xSepv">
+                              <node concept="3Aq9E8" id="6tnA46891HB" role="3xSepj">
+                                <node concept="3I6sU6" id="6tnA46891HC" role="3Ip0Jz">
+                                  <node concept="3I6s7M" id="6tnA46891HH" role="3I6sU7">
+                                    <node concept="1lHd6T" id="6tnA46891HG" role="3I6s78">
                                       <property role="1lHdp1" value="4jcOV4hu0n_/ERROR" />
-                                      <node concept="Xl_RD" id="5mvKPwwqGxH" role="1ljv2e">
+                                      <node concept="Xl_RD" id="6tnA46891HM" role="1ljv2e">
                                         <property role="Xl_RC" value="Interface expected" />
                                       </node>
-                                      <node concept="3G3gwz" id="5mvKPwwqGxI" role="3Gvizk">
-                                        <node concept="2OqwBi" id="5mvKPwwqGxJ" role="3G3gzb">
-                                          <node concept="37vLTw" id="5mvKPwwqGxK" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="5mvKPwwqGy0" resolve="auxBnd" />
-                                          </node>
-                                          <node concept="iZEcu" id="5mvKPwwqGxL" role="2OqNvi" />
-                                        </node>
-                                      </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="3fqX7Q" id="5mvKPwwqGxM" role="3clFbw">
-                                  <node concept="2OqwBi" id="5mvKPwwqGxN" role="3fr31v">
-                                    <node concept="2OqwBi" id="5mvKPwwqGxO" role="2Oq$k0">
-                                      <node concept="37vLTw" id="5mvKPwwqGxP" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="5mvKPwwqGy0" resolve="auxBnd" />
-                                      </node>
-                                      <node concept="3TrEf2" id="5mvKPwwqGxQ" role="2OqNvi">
-                                        <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
-                                      </node>
-                                    </node>
-                                    <node concept="1mIQ4w" id="5mvKPwwqGxR" role="2OqNvi">
-                                      <node concept="chp4Y" id="5mvKPwwqGxS" role="cj9EA">
-                                        <ref role="cht4Q" to="tpee:g7HP654" resolve="Interface" />
-                                      </node>
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3cpWsn" id="5mvKPwwqGy0" role="1Duv9x">
-                              <property role="TrG5h" value="auxBnd" />
-                              <node concept="3Tqbb2" id="5mvKPwwqGy1" role="1tU5fm">
-                                <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                              </node>
-                            </node>
-                            <node concept="2OqwBi" id="5mvKPwwqGy2" role="1DdaDG">
-                              <node concept="3A2sRY" id="5mvKPwwqKhK" role="2Oq$k0">
-                                <ref role="3A2yKK" node="5mvKPwwqDYA" resolve="tvd" />
-                              </node>
-                              <node concept="3Tsc0h" id="5mvKPwwqGy4" role="2OqNvi">
-                                <ref role="3TtcxE" to="tpee:hFD4UhQ" resolve="auxBounds" />
                               </node>
                             </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="37vLTw" id="6tnA46891zI" role="3Hbm9W">
+                        <ref role="3cqZAo" node="6tnA4688W4Q" resolve="auxBnd" />
+                      </node>
                     </node>
                   </node>
+                  <node concept="3fqX7Q" id="6tnA4688W4J" role="3clFbw">
+                    <node concept="2OqwBi" id="6tnA4688W4K" role="3fr31v">
+                      <node concept="2OqwBi" id="6tnA4688W4L" role="2Oq$k0">
+                        <node concept="37vLTw" id="6tnA4688W4M" role="2Oq$k0">
+                          <ref role="3cqZAo" node="6tnA4688W4Q" resolve="auxBnd" />
+                        </node>
+                        <node concept="3TrEf2" id="6tnA4688W4N" role="2OqNvi">
+                          <ref role="3Tt5mk" to="tpee:g7uigIF" resolve="classifier" />
+                        </node>
+                      </node>
+                      <node concept="1mIQ4w" id="6tnA4688W4O" role="2OqNvi">
+                        <node concept="chp4Y" id="6tnA4688W4P" role="cj9EA">
+                          <ref role="cht4Q" to="tpee:g7HP654" resolve="Interface" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWsn" id="6tnA4688W4Q" role="1Duv9x">
+                <property role="TrG5h" value="auxBnd" />
+                <node concept="3Tqbb2" id="6tnA4688W4R" role="1tU5fm">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
+              </node>
+              <node concept="2OqwBi" id="6tnA4688W4S" role="1DdaDG">
+                <node concept="3A2sRY" id="6tnA4688W4T" role="2Oq$k0">
+                  <ref role="3A2yKK" node="5mvKPwwqDYA" resolve="tvd" />
+                </node>
+                <node concept="3Tsc0h" id="6tnA4688W4U" role="2OqNvi">
+                  <ref role="3TtcxE" to="tpee:hFD4UhQ" resolve="auxBounds" />
                 </node>
               </node>
             </node>