From 0a50c5cc0aee3a3c369a5f1385bc3e0582e0caed Mon Sep 17 00:00:00 2001
From: Tamas Szabo <tamas.szabo@itemis.de>
Date: Wed, 27 Jan 2016 17:13:20 +0100
Subject: [PATCH] su overhaul part 1

---
 .../generator/template/main@generator.mps     | 225 +------
 .../languageModels/behavior.mps               | 316 +++------
 .../languageModels/constraints.mps            | 275 +-------
 .../languageModels/editor.mps                 |  34 -
 .../languageModels/migration.mps              |   2 +
 .../languageModels/structure.mps              |  14 -
 .../languageModels/typesystem.mps             |  30 -
 .../languages/com.mbeddr.core.udt/udt.mpl     |   1 +
 .../test/ex/core/anonymous_member.mps         | 443 -------------
 .../test/ex/core/structsAndEnums.mps          |  21 +-
 .../test.ex.core/test/ex/core/unions.mps      |  16 +-
 .../test.ts.core/models/tests1@tests.mps      | 604 ------------------
 .../tests/ts/core/importing@tests.mps         |  65 +-
 .../com/mbeddr/mpsutil/common/graph.mps       |  22 +-
 14 files changed, 136 insertions(+), 1932 deletions(-)
 delete mode 100644 code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/anonymous_member.mps

diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps
index 0396ba99a51..095d02b7235 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/generator/template/main@generator.mps
@@ -17,240 +17,17 @@
     <import index="mj1l" ref="r:c371cf98-dcc8-4a43-8eb8-8a8096de18b2(com.mbeddr.core.expressions.structure)" />
   </imports>
   <registry>
-    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <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="1137021947720" name="jetbrains.mps.baseLanguage.structure.ConceptFunction" flags="in" index="2VMwT0">
-        <child id="1137022507850" name="body" index="2VODD2" />
-      </concept>
-      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
-        <child id="1068580123156" name="expression" index="3clFbG" />
-      </concept>
-      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
-        <child id="1068581517665" name="statement" index="3cqZAp" />
-      </concept>
-    </language>
-    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements">
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
-        <child id="7763322639126652758" name="baseType" index="2umbIo" />
-      </concept>
-      <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
-        <child id="7254843406768833939" name="expr" index="1_9egR" />
-      </concept>
-      <concept id="4185783222026475238" name="com.mbeddr.core.statements.structure.LocalVariableDeclaration" flags="ng" index="3XIRlf" />
-      <concept id="4185783222026475861" name="com.mbeddr.core.statements.structure.StatementList" flags="ng" index="3XIRFW">
-        <child id="4185783222026475862" name="statements" index="3XIRFZ" />
-      </concept>
-      <concept id="2093108837558113914" name="com.mbeddr.core.statements.structure.LocalVarRef" flags="ng" index="3ZVu4v">
-        <reference id="2093108837558124071" name="var" index="3ZVs_2" />
-      </concept>
-    </language>
-    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" name="com.mbeddr.core.pointers">
-      <concept id="6113173064528067332" name="com.mbeddr.core.pointers.structure.StringType" flags="ng" index="Pu267" />
-      <concept id="5679441017214012545" name="com.mbeddr.core.pointers.structure.ArrayType" flags="ng" index="3J0A42" />
-    </language>
     <language id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator">
-      <concept id="1114706874351" name="jetbrains.mps.lang.generator.structure.CopySrcNodeMacro" flags="ln" index="29HgVG">
-        <child id="1168024447342" name="sourceNodeQuery" index="3NFExx" />
-      </concept>
-      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia">
-        <child id="1167328349397" name="reductionMappingRule" index="3acgRq" />
-      </concept>
-      <concept id="1095672379244" name="jetbrains.mps.lang.generator.structure.TemplateFragment" flags="ng" index="raruj" />
-      <concept id="1167168920554" name="jetbrains.mps.lang.generator.structure.BaseMappingRule_Condition" flags="in" index="30G5F_" />
-      <concept id="1167169188348" name="jetbrains.mps.lang.generator.structure.TemplateFunctionParameter_sourceNode" flags="nn" index="30H73N" />
-      <concept id="1167169308231" name="jetbrains.mps.lang.generator.structure.BaseMappingRule" flags="ng" index="30H$t8">
-        <reference id="1167169349424" name="applicableConcept" index="30HIoZ" />
-        <child id="1167169362365" name="conditionFunction" index="30HLyM" />
-      </concept>
-      <concept id="1167327847730" name="jetbrains.mps.lang.generator.structure.Reduction_MappingRule" flags="lg" index="3aamgX">
-        <child id="1169672767469" name="ruleConsequence" index="1lVwrX" />
-      </concept>
-      <concept id="8900764248744213868" name="jetbrains.mps.lang.generator.structure.InlineTemplateWithContext_RuleConsequence" flags="lg" index="1Koe21">
-        <child id="8900764248744213871" name="contentNode" index="1Koe22" />
-      </concept>
-      <concept id="1168024337012" name="jetbrains.mps.lang.generator.structure.SourceSubstituteMacro_SourceNodeQuery" flags="in" index="3NFfHV" />
-    </language>
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" name="com.mbeddr.core.udt">
-      <concept id="3930924638067536683" name="com.mbeddr.core.udt.structure.ArbitraryMemeberRef" flags="ng" index="2kls0a">
-        <property id="3930924638067536840" name="membername" index="2kls3D" />
-      </concept>
-      <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
-        <child id="7099329415459888018" name="members" index="HszBJ" />
-      </concept>
-      <concept id="5882395403881875736" name="com.mbeddr.core.udt.structure.Member" flags="ng" index="1dpRTG" />
-      <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
-      <concept id="6394819151180597816" name="com.mbeddr.core.udt.structure.StructType" flags="ng" index="1sgJKr">
-        <reference id="6394819151180597817" name="struct" index="1sgJKq" />
-      </concept>
-    </language>
-    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
-        <child id="8967919205527146150" name="expression" index="2BFjQA" />
-      </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
-        <child id="5708867820623310661" name="arguments" index="1UOdpc" />
-      </concept>
-      <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
-        <child id="6437088627575722833" name="contents" index="N3F5h" />
-      </concept>
-      <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
-        <property id="1317894735999272944" name="exported" index="2OOxQR" />
-      </concept>
-      <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
-        <child id="4185783222026475860" name="body" index="3XIRFX" />
-      </concept>
-      <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-    </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>
-      <concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
-        <reference id="1138056516764" name="link" index="3Tt5mk" />
-      </concept>
+      <concept id="1095416546421" name="jetbrains.mps.lang.generator.structure.MappingConfiguration" flags="ig" index="bUwia" />
     </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="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="8463282783691618440" name="com.mbeddr.core.expressions.structure.Int32tType" flags="ng" index="26Vqph" />
-      <concept id="8463282783691618435" name="com.mbeddr.core.expressions.structure.Int16tType" flags="ng" index="26Vqpq" />
-      <concept id="3005510381523579442" name="com.mbeddr.core.expressions.structure.UnaryExpression" flags="ng" index="2aKSnQ">
-        <child id="7254843406768839760" name="expression" index="1_9fRO" />
-      </concept>
-      <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
-        <property id="2212975673976043696" name="value" index="2hmy$m" />
-      </concept>
-      <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
-        <child id="7034214596252529803" name="target" index="1ESnxz" />
-      </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
-        <child id="318113533128716676" name="type" index="2C2TGm" />
-      </concept>
-      <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
-        <property id="2941277002445651368" name="const" index="2c7vTL" />
-        <property id="2941277002448691247" name="volatile" index="2caQfQ" />
-      </concept>
-      <concept id="8860443239512128103" name="com.mbeddr.core.expressions.structure.NumberLiteral" flags="ng" index="3TlMh9" />
-    </language>
   </registry>
   <node concept="bUwia" id="7ya9dtegX_R">
     <property role="TrG5h" value="main" />
-    <node concept="3aamgX" id="7KLlXp7NWI2" role="3acgRq">
-      <ref role="30HIoZ" to="mj1l:40tXLnqhyKc" resolve="GenericDotExpression" />
-      <node concept="1Koe21" id="7KLlXp7NZDf" role="1lVwrX">
-        <node concept="N3F5e" id="7KLlXp7NZS7" role="1Koe22">
-          <property role="TrG5h" value="dummy" />
-          <node concept="1sgJKc" id="7KLlXp7NZSb" role="N3F5h">
-            <property role="TrG5h" value="aStruct" />
-            <node concept="1dpRTG" id="7KLlXp7NZSf" role="HszBJ">
-              <property role="TrG5h" value="a" />
-              <node concept="26Vqpq" id="7KLlXp7NZSe" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="N3Fnx" id="7KLlXp7O00d" role="N3F5h">
-            <property role="TrG5h" value="main" />
-            <property role="2OOxQR" value="true" />
-            <node concept="3XIRFW" id="7KLlXp7O00f" role="3XIRFX">
-              <node concept="3XIRlf" id="7KLlXp7O0gw" role="3XIRFZ">
-                <property role="TrG5h" value="v" />
-                <node concept="1sgJKr" id="7KLlXp7O0gv" role="2C2TGm">
-                  <property role="2caQfQ" value="false" />
-                  <property role="2c7vTL" value="false" />
-                  <ref role="1sgJKq" node="7KLlXp7NZSb" resolve="aStruct" />
-                </node>
-              </node>
-              <node concept="1_9egQ" id="7KLlXp7O0Zh" role="3XIRFZ">
-                <node concept="2qmXGp" id="7KLlXp7O12E" role="1_9egR">
-                  <node concept="2kls0a" id="7KLlXp7O1j$" role="1ESnxz">
-                    <property role="2kls3D" value="dummy" />
-                  </node>
-                  <node concept="3ZVu4v" id="7KLlXp7O0Zf" role="1_9fRO">
-                    <ref role="3ZVs_2" node="7KLlXp7O0gw" resolve="v" />
-                    <node concept="raruj" id="5WwC2ssVJKU" role="lGtFl" />
-                    <node concept="29HgVG" id="5WwC2ssVQGM" role="lGtFl">
-                      <node concept="3NFfHV" id="5WwC2ssVQGN" role="3NFExx">
-                        <node concept="3clFbS" id="5WwC2ssVQGO" role="2VODD2">
-                          <node concept="3clFbF" id="5WwC2ssVRfK" role="3cqZAp">
-                            <node concept="2OqwBi" id="5WwC2ssVQGP" role="3clFbG">
-                              <node concept="3TrEf2" id="5WwC2ssVQGS" role="2OqNvi">
-                                <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" />
-                              </node>
-                              <node concept="30H73N" id="5WwC2ssVRfJ" role="2Oq$k0" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2BFjQ_" id="7KLlXp7O00n" role="3XIRFZ">
-                <node concept="3TlMh9" id="7KLlXp7O00o" role="2BFjQA">
-                  <property role="2hmy$m" value="0" />
-                </node>
-              </node>
-            </node>
-            <node concept="26Vqph" id="7KLlXp7O00h" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-            <node concept="19RgSI" id="7KLlXp7O00i" role="1UOdpc">
-              <property role="TrG5h" value="argc" />
-              <node concept="26Vqph" id="7KLlXp7O00j" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="19RgSI" id="7KLlXp7O00k" role="1UOdpc">
-              <property role="TrG5h" value="argv" />
-              <node concept="3J0A42" id="7KLlXp7O00l" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-                <node concept="Pu267" id="7KLlXp7O00m" role="2umbIo">
-                  <property role="2caQfQ" value="false" />
-                  <property role="2c7vTL" value="false" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="30G5F_" id="7KLlXp7NWI8" role="30HLyM">
-        <node concept="3clFbS" id="7KLlXp7NWI9" role="2VODD2">
-          <node concept="3clFbF" id="7KLlXp7NWSm" role="3cqZAp">
-            <node concept="2OqwBi" id="7KLlXp7NYIO" role="3clFbG">
-              <node concept="2OqwBi" id="7KLlXp7NWZQ" role="2Oq$k0">
-                <node concept="30H73N" id="7KLlXp7NWSl" role="2Oq$k0" />
-                <node concept="3TrEf2" id="7KLlXp7NXU_" role="2OqNvi">
-                  <ref role="3Tt5mk" to="mj1l:66uzewbvZib" />
-                </node>
-              </node>
-              <node concept="1mIQ4w" id="7KLlXp7NZbZ" role="2OqNvi">
-                <node concept="chp4Y" id="7KLlXp7NZqp" role="cj9EA">
-                  <ref role="cht4Q" to="clbe:1$5WwmOqNKi" resolve="InnerSUDeclarationRef" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
index 81beeef15ff..3a15b3398ff 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/behavior.mps
@@ -407,7 +407,6 @@
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162934736510" name="jetbrains.mps.baseLanguage.collections.structure.GetElementOperation" flags="nn" index="34jXtK" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
-      <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
       <concept id="1178286324487" name="jetbrains.mps.baseLanguage.collections.structure.SortDirection" flags="nn" index="1nlBCl" />
       <concept id="1197683403723" name="jetbrains.mps.baseLanguage.collections.structure.MapType" flags="in" index="3rvAFt">
         <child id="1197683466920" name="keyType" index="3rvQeY" />
@@ -3655,123 +3654,9 @@
       <property role="TrG5h" value="getUniquelyNamedElements" />
       <ref role="13i0hy" to="hwgx:4qSf1u1TRfj" resolve="getUniquelyNamedElements" />
       <node concept="3clFbS" id="4qSf1u1Vs15" role="3clF47">
-        <node concept="3cpWs8" id="7ya9dte9AQF" role="3cqZAp">
-          <node concept="3cpWsn" id="7ya9dte9AQI" role="3cpWs9">
-            <property role="TrG5h" value="result" />
-            <node concept="2I9FWS" id="7ya9dte9AQD" role="1tU5fm">
-              <ref role="2I9WkF" to="tpck:h0TrEE$" resolve="INamedConcept" />
-            </node>
-            <node concept="2ShNRf" id="7ya9dte9B1m" role="33vP2m">
-              <node concept="2T8Vx0" id="7ya9dte9PQR" role="2ShVmc">
-                <node concept="2I9FWS" id="7ya9dte9PQT" role="2T96Bj">
-                  <ref role="2I9WkF" to="tpck:h0TrEE$" resolve="INamedConcept" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7ya9dte9Qec" role="3cqZAp">
-          <node concept="2OqwBi" id="7ya9dte9QCg" role="3clFbG">
-            <node concept="37vLTw" id="7ya9dte9Qea" role="2Oq$k0">
-              <ref role="3cqZAo" node="7ya9dte9AQI" resolve="result" />
-            </node>
-            <node concept="X8dFx" id="7ya9dte9Wnc" role="2OqNvi">
-              <node concept="2OqwBi" id="6QawkaHVhrC" role="25WWJ7">
-                <node concept="2OqwBi" id="7ya9dte9XZX" role="2Oq$k0">
-                  <node concept="13iPFW" id="7ya9dte9XRY" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="6QawkaHVgdb" role="2OqNvi">
-                    <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
-                  </node>
-                </node>
-                <node concept="v3k3i" id="6QawkaHVkYX" role="2OqNvi">
-                  <node concept="chp4Y" id="6QawkaHVlMg" role="v3oSu">
-                    <ref role="cht4Q" to="clbe:56ytRgsLg$o" resolve="Member" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7ya9dtea_pY" role="3cqZAp" />
-        <node concept="3clFbF" id="7ya9dteaoqf" role="3cqZAp">
-          <node concept="2OqwBi" id="7ya9dteapli" role="3clFbG">
-            <node concept="37vLTw" id="7ya9dteaoqd" role="2Oq$k0">
-              <ref role="3cqZAo" node="7ya9dte9AQI" resolve="result" />
-            </node>
-            <node concept="X8dFx" id="7ya9dteat6F" role="2OqNvi">
-              <node concept="2OqwBi" id="7ya9dteaiyR" role="25WWJ7">
-                <node concept="2OqwBi" id="7ya9dteai1G" role="2Oq$k0">
-                  <node concept="2OqwBi" id="7ya9dteai1H" role="2Oq$k0">
-                    <node concept="13iPFW" id="7ya9dteai1I" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="7ya9dteai1J" role="2OqNvi">
-                      <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
-                    </node>
-                  </node>
-                  <node concept="3zZkjj" id="7ya9dteai1K" role="2OqNvi">
-                    <node concept="1bVj0M" id="7ya9dteai1L" role="23t8la">
-                      <node concept="3clFbS" id="7ya9dteai1M" role="1bW5cS">
-                        <node concept="3clFbF" id="7ya9dteai1N" role="3cqZAp">
-                          <node concept="22lmx$" id="7ya9dteai1O" role="3clFbG">
-                            <node concept="2OqwBi" id="7ya9dteai1P" role="3uHU7w">
-                              <node concept="37vLTw" id="7ya9dteai1Q" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7ya9dteai1X" resolve="it" />
-                              </node>
-                              <node concept="1mIQ4w" id="7ya9dteai1R" role="2OqNvi">
-                                <node concept="chp4Y" id="7ya9dteai1S" role="cj9EA">
-                                  <ref role="cht4Q" to="clbe:7ya9dte0lCz" resolve="AnonymousUnionDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="2OqwBi" id="7ya9dteai1T" role="3uHU7B">
-                              <node concept="37vLTw" id="7ya9dteai1U" role="2Oq$k0">
-                                <ref role="3cqZAo" node="7ya9dteai1X" resolve="it" />
-                              </node>
-                              <node concept="1mIQ4w" id="7ya9dteai1V" role="2OqNvi">
-                                <node concept="chp4Y" id="7ya9dteai1W" role="cj9EA">
-                                  <ref role="cht4Q" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="Rh6nW" id="7ya9dteai1X" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="7ya9dteai1Y" role="1tU5fm" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3goQfb" id="7ya9dteakE9" role="2OqNvi">
-                  <node concept="1bVj0M" id="7ya9dteakEb" role="23t8la">
-                    <node concept="3clFbS" id="7ya9dteakEc" role="1bW5cS">
-                      <node concept="3clFbF" id="7ya9dteakKM" role="3cqZAp">
-                        <node concept="2OqwBi" id="7ya9dteamkE" role="3clFbG">
-                          <node concept="1PxgMI" id="7ya9dtealKN" role="2Oq$k0">
-                            <ref role="1PxNhF" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
-                            <node concept="37vLTw" id="7ya9dteakKL" role="1PxMeX">
-                              <ref role="3cqZAo" node="7ya9dteakEd" resolve="it" />
-                            </node>
-                          </node>
-                          <node concept="2qgKlT" id="7ya9dteanrx" role="2OqNvi">
-                            <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="Rh6nW" id="7ya9dteakEd" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="7ya9dteakEe" role="1tU5fm" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs6" id="4qSf1u1Vs16" role="3cqZAp">
-          <node concept="37vLTw" id="7ya9dtea0Qc" role="3cqZAk">
-            <ref role="3cqZAo" node="7ya9dte9AQI" resolve="result" />
+        <node concept="3cpWs6" id="1Nl0v8EOKCF" role="3cqZAp">
+          <node concept="BsUDl" id="1Nl0v8EOKD1" role="3cqZAk">
+            <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
           </node>
         </node>
       </node>
@@ -3830,89 +3715,118 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6QawkaHOwNL" role="3cqZAp">
-          <node concept="2OqwBi" id="6QawkaHOydB" role="3clFbG">
-            <node concept="37vLTw" id="6QawkaHOwNJ" role="2Oq$k0">
-              <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
-            </node>
-            <node concept="X8dFx" id="6QawkaHOAAl" role="2OqNvi">
-              <node concept="2OqwBi" id="6QawkaHOeY2" role="25WWJ7">
-                <node concept="2OqwBi" id="6QawkaHOeY3" role="2Oq$k0">
-                  <node concept="13iPFW" id="6QawkaHOeY4" role="2Oq$k0" />
-                  <node concept="3Tsc0h" id="6QawkaHOeY5" role="2OqNvi">
-                    <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
+        <node concept="2Gpval" id="1Nl0v8EJvNn" role="3cqZAp">
+          <node concept="2GrKxI" id="1Nl0v8EJvNp" role="2Gsz3X">
+            <property role="TrG5h" value="member" />
+          </node>
+          <node concept="3clFbS" id="1Nl0v8EJvNr" role="2LFqv$">
+            <node concept="3clFbJ" id="1Nl0v8EJwKH" role="3cqZAp">
+              <node concept="3clFbS" id="1Nl0v8EJwKI" role="3clFbx">
+                <node concept="3clFbF" id="1Nl0v8EJwYV" role="3cqZAp">
+                  <node concept="2OqwBi" id="1Nl0v8EJy5h" role="3clFbG">
+                    <node concept="37vLTw" id="1Nl0v8EJwYU" role="2Oq$k0">
+                      <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
+                    </node>
+                    <node concept="TSZUe" id="1Nl0v8EJBgm" role="2OqNvi">
+                      <node concept="1PxgMI" id="1Nl0v8EJBp7" role="25WWJ7">
+                        <ref role="1PxNhF" to="clbe:56ytRgsLg$o" resolve="Member" />
+                        <node concept="2GrUjf" id="1Nl0v8EJBhj" role="1PxMeX">
+                          <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="v3k3i" id="6QawkaHOeY6" role="2OqNvi">
-                  <node concept="chp4Y" id="6QawkaHOeY7" role="v3oSu">
+              </node>
+              <node concept="2OqwBi" id="1Nl0v8EJwN5" role="3clFbw">
+                <node concept="2GrUjf" id="1Nl0v8EJwL1" role="2Oq$k0">
+                  <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
+                </node>
+                <node concept="1mIQ4w" id="1Nl0v8EJwWx" role="2OqNvi">
+                  <node concept="chp4Y" id="1Nl0v8EJwXp" role="cj9EA">
                     <ref role="cht4Q" to="clbe:56ytRgsLg$o" resolve="Member" />
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6QawkaHOBnr" role="3cqZAp">
-          <node concept="2OqwBi" id="6QawkaHOCL9" role="3clFbG">
-            <node concept="37vLTw" id="6QawkaHOBnp" role="2Oq$k0">
-              <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
-            </node>
-            <node concept="X8dFx" id="6QawkaHOHaq" role="2OqNvi">
-              <node concept="2OqwBi" id="6QawkaHOOyr" role="25WWJ7">
-                <node concept="2OqwBi" id="6QawkaHOMr_" role="2Oq$k0">
-                  <node concept="2OqwBi" id="6QawkaHOHke" role="2Oq$k0">
-                    <node concept="13iPFW" id="6QawkaHOHd8" role="2Oq$k0" />
-                    <node concept="3Tsc0h" id="6QawkaHOHN$" role="2OqNvi">
-                      <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
+              <node concept="3eNFk2" id="1Nl0v8EJBiG" role="3eNLev">
+                <node concept="2OqwBi" id="1Nl0v8EJFWQ" role="3eO9$A">
+                  <node concept="2GrUjf" id="1Nl0v8EJFUs" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
+                  </node>
+                  <node concept="1mIQ4w" id="1Nl0v8EJG8t" role="2OqNvi">
+                    <node concept="chp4Y" id="1Nl0v8EJG9l" role="cj9EA">
+                      <ref role="cht4Q" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
                     </node>
                   </node>
-                  <node concept="3zZkjj" id="6QawkaHONok" role="2OqNvi">
-                    <node concept="1bVj0M" id="6QawkaHONom" role="23t8la">
-                      <node concept="3clFbS" id="6QawkaHONon" role="1bW5cS">
-                        <node concept="3clFbF" id="6QawkaHON$U" role="3cqZAp">
-                          <node concept="2OqwBi" id="6QawkaHONK2" role="3clFbG">
-                            <node concept="37vLTw" id="6QawkaHON$T" role="2Oq$k0">
-                              <ref role="3cqZAo" node="6QawkaHONoo" resolve="it" />
-                            </node>
-                            <node concept="3TrcHB" id="6QawkaIN3qE" role="2OqNvi">
-                              <ref role="3TsBF5" to="clbe:6QawkaIMrjd" resolve="transparent" />
+                </node>
+                <node concept="3clFbS" id="1Nl0v8EJBiI" role="3eOfB_">
+                  <node concept="3clFbF" id="1Nl0v8EJGb7" role="3cqZAp">
+                    <node concept="2OqwBi" id="1Nl0v8EJHht" role="3clFbG">
+                      <node concept="37vLTw" id="1Nl0v8EJGb6" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
+                      </node>
+                      <node concept="X8dFx" id="1Nl0v8EJMsy" role="2OqNvi">
+                        <node concept="2OqwBi" id="1Nl0v8EJN44" role="25WWJ7">
+                          <node concept="1PxgMI" id="1Nl0v8EJM$B" role="2Oq$k0">
+                            <ref role="1PxNhF" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
+                            <node concept="2GrUjf" id="1Nl0v8EJMwc" role="1PxMeX">
+                              <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
                             </node>
                           </node>
+                          <node concept="2qgKlT" id="1Nl0v8EJNtL" role="2OqNvi">
+                            <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
+                          </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="6QawkaHONoo" role="1bW2Oz">
-                        <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="6QawkaHONop" role="1tU5fm" />
-                      </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3goQfb" id="6QawkaHOSrE" role="2OqNvi">
-                  <node concept="1bVj0M" id="6QawkaHOSrG" role="23t8la">
-                    <node concept="3clFbS" id="6QawkaHOSrH" role="1bW5cS">
-                      <node concept="3clFbF" id="6QawkaHOS$$" role="3cqZAp">
-                        <node concept="2OqwBi" id="6QawkaHOSL9" role="3clFbG">
-                          <node concept="37vLTw" id="6QawkaHOS$z" role="2Oq$k0">
-                            <ref role="3cqZAo" node="6QawkaHOSrI" resolve="it" />
+              </node>
+              <node concept="3eNFk2" id="1Nl0v8EJNB5" role="3eNLev">
+                <node concept="3clFbS" id="1Nl0v8EJNB7" role="3eOfB_">
+                  <node concept="3clFbF" id="1Nl0v8EJObI" role="3cqZAp">
+                    <node concept="2OqwBi" id="1Nl0v8EJObJ" role="3clFbG">
+                      <node concept="37vLTw" id="1Nl0v8EJObK" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
+                      </node>
+                      <node concept="X8dFx" id="1Nl0v8EJObL" role="2OqNvi">
+                        <node concept="2OqwBi" id="1Nl0v8EJObM" role="25WWJ7">
+                          <node concept="1PxgMI" id="1Nl0v8EJObN" role="2Oq$k0">
+                            <ref role="1PxNhF" to="clbe:7ya9dte0lCz" resolve="AnonymousUnionDeclaration" />
+                            <node concept="2GrUjf" id="1Nl0v8EJObO" role="1PxMeX">
+                              <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
+                            </node>
                           </node>
-                          <node concept="2qgKlT" id="6QawkaIYSF1" role="2OqNvi">
-                            <ref role="37wK5l" node="6QawkaIMrYF" resolve="transparentlyVisibleContents" />
+                          <node concept="2qgKlT" id="1Nl0v8EJObP" role="2OqNvi">
+                            <ref role="37wK5l" node="7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
                           </node>
                         </node>
                       </node>
                     </node>
-                    <node concept="Rh6nW" id="6QawkaHOSrI" role="1bW2Oz">
-                      <property role="TrG5h" value="it" />
-                      <node concept="2jxLKc" id="6QawkaHOSrJ" role="1tU5fm" />
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="1Nl0v8EJNLG" role="3eO9$A">
+                  <node concept="2GrUjf" id="1Nl0v8EJNLH" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="1Nl0v8EJvNp" resolve="member" />
+                  </node>
+                  <node concept="1mIQ4w" id="1Nl0v8EJNLI" role="2OqNvi">
+                    <node concept="chp4Y" id="1Nl0v8EJNN$" role="cj9EA">
+                      <ref role="cht4Q" to="clbe:7ya9dte0lCz" resolve="AnonymousUnionDeclaration" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
+          <node concept="2OqwBi" id="1Nl0v8EJwmi" role="2GsD0m">
+            <node concept="13iPFW" id="1Nl0v8EJwgw" role="2Oq$k0" />
+            <node concept="3Tsc0h" id="1Nl0v8EJwIZ" role="2OqNvi">
+              <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
+            </node>
+          </node>
         </node>
-        <node concept="3clFbF" id="6QawkaHTTNe" role="3cqZAp">
-          <node concept="37vLTw" id="6QawkaHOeY9" role="3clFbG">
+        <node concept="3cpWs6" id="1Nl0v8EJPcG" role="3cqZAp">
+          <node concept="37vLTw" id="1Nl0v8EJPcH" role="3cqZAk">
             <ref role="3cqZAo" node="6QawkaHOeY0" resolve="members" />
           </node>
         </node>
@@ -3964,8 +3878,8 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="6aQaNXUb91" role="3cqZAp">
-          <node concept="37vLTw" id="6aQaNXUb92" role="3clFbG">
+        <node concept="3cpWs6" id="1Nl0v8EPvkq" role="3cqZAp">
+          <node concept="37vLTw" id="1Nl0v8EPvkr" role="3cqZAk">
             <ref role="3cqZAo" node="6aQaNXUb8m" resolve="members" />
           </node>
         </node>
@@ -3976,29 +3890,29 @@
       <node concept="3Tm1VV" id="16nhtBDHnvp" role="1B3o_S" />
       <node concept="17QB3L" id="16nhtBDHwgA" role="3clF45" />
       <node concept="3clFbS" id="16nhtBDHnvr" role="3clF47">
-        <node concept="3clFbF" id="16nhtBDHwQk" role="3cqZAp">
-          <node concept="3cpWs3" id="16nhtBDH_YP" role="3clFbG">
-            <node concept="2OqwBi" id="16nhtBDHAvR" role="3uHU7w">
-              <node concept="Xl_RD" id="16nhtBDH_YS" role="2Oq$k0">
+        <node concept="3cpWs6" id="1Nl0v8EPvDR" role="3cqZAp">
+          <node concept="3cpWs3" id="1Nl0v8EPvDS" role="3cqZAk">
+            <node concept="2OqwBi" id="1Nl0v8EPvDT" role="3uHU7w">
+              <node concept="Xl_RD" id="1Nl0v8EPvDU" role="2Oq$k0">
                 <property role="Xl_RC" value="" />
               </node>
-              <node concept="liA8E" id="16nhtBDHBzx" role="2OqNvi">
+              <node concept="liA8E" id="1Nl0v8EPvDV" role="2OqNvi">
                 <ref role="37wK5l" to="wyt6:~String.toLowerCase():java.lang.String" resolve="toLowerCase" />
               </node>
             </node>
-            <node concept="2OqwBi" id="16nhtBDHzQg" role="3uHU7B">
-              <node concept="2OqwBi" id="16nhtBDHyVL" role="2Oq$k0">
-                <node concept="2OqwBi" id="16nhtBDHwZ1" role="2Oq$k0">
-                  <node concept="13iPFW" id="16nhtBDHwQj" role="2Oq$k0" />
-                  <node concept="3NT_Vc" id="16nhtBDHykP" role="2OqNvi" />
+            <node concept="2OqwBi" id="1Nl0v8EPvDW" role="3uHU7B">
+              <node concept="2OqwBi" id="1Nl0v8EPvDX" role="2Oq$k0">
+                <node concept="2OqwBi" id="1Nl0v8EPvDY" role="2Oq$k0">
+                  <node concept="13iPFW" id="1Nl0v8EPvDZ" role="2Oq$k0" />
+                  <node concept="3NT_Vc" id="1Nl0v8EPvE0" role="2OqNvi" />
                 </node>
-                <node concept="3TrcHB" id="16nhtBDHziR" role="2OqNvi">
+                <node concept="3TrcHB" id="1Nl0v8EPvE1" role="2OqNvi">
                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
                 </node>
               </node>
-              <node concept="liA8E" id="16nhtBDH_76" role="2OqNvi">
+              <node concept="liA8E" id="1Nl0v8EPvE2" role="2OqNvi">
                 <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
-                <node concept="3cmrfG" id="16nhtBDH_pO" role="37wK5m">
+                <node concept="3cmrfG" id="1Nl0v8EPvE3" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                 </node>
               </node>
@@ -6373,30 +6287,6 @@
       <node concept="17QB3L" id="4MEpx3I12iS" role="3clF45" />
     </node>
   </node>
-  <node concept="13h7C7" id="1$5WwmOx_oW">
-    <ref role="13h7C2" to="clbe:1$5WwmOqNKi" resolve="InnerSUDeclarationRef" />
-    <node concept="13hLZK" id="1$5WwmOx_oX" role="13h7CW">
-      <node concept="3clFbS" id="1$5WwmOx_oY" role="2VODD2" />
-    </node>
-    <node concept="13i0hz" id="1$5WwmOxA88" role="13h7CS">
-      <property role="13i0iv" value="false" />
-      <property role="13i0it" value="false" />
-      <property role="TrG5h" value="getTarget" />
-      <ref role="13i0hy" to="ywuz:66uzewbZgGM" resolve="getTarget" />
-      <node concept="3Tm1VV" id="1$5WwmOxA89" role="1B3o_S" />
-      <node concept="3clFbS" id="1$5WwmOxA8c" role="3clF47">
-        <node concept="3clFbF" id="1$5WwmOxAf3" role="3cqZAp">
-          <node concept="2OqwBi" id="1$5WwmOxAgH" role="3clFbG">
-            <node concept="13iPFW" id="1$5WwmOxAf2" role="2Oq$k0" />
-            <node concept="3TrEf2" id="1$5WwmOxAVo" role="2OqNvi">
-              <ref role="3Tt5mk" to="clbe:1$5WwmOqNMe" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="3Tqbb2" id="1$5WwmOxA8d" role="3clF45" />
-    </node>
-  </node>
   <node concept="13h7C7" id="54LEWgwZkzN">
     <property role="3GE5qa" value="su" />
     <ref role="13h7C2" to="clbe:7TdHRrCvnnh" resolve="SUContent" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
index 699a0f373d5..2b499377596 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/constraints.mps
@@ -137,9 +137,6 @@
         <child id="1144104376918" name="parameter" index="1xVPHs" />
       </concept>
       <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
-      <concept id="4693937538533521280" name="jetbrains.mps.lang.smodel.structure.OfConceptOperation" flags="ng" index="v3k3i">
-        <child id="4693937538533538124" name="requestedConcept" index="v3oSu" />
-      </concept>
       <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
         <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
       </concept>
@@ -150,7 +147,6 @@
       <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
         <child id="1177027386292" name="conceptArgument" index="cj9EA" />
       </concept>
-      <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144100932627" name="jetbrains.mps.lang.smodel.structure.OperationParm_Inclusion" flags="ng" index="1xIGOp" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
         <child id="1207343664468" name="conceptArgument" index="ri$Ld" />
@@ -1038,9 +1034,6 @@
                 <node concept="3clFbS" id="3DiW6qrG4EU" role="3clFbx">
                   <node concept="3cpWs6" id="3DiW6qrG7U1" role="3cqZAp">
                     <node concept="2OqwBi" id="7FkLcyz8v2u" role="3cqZAk">
-                      <node concept="2qgKlT" id="6aQaNXUlJ1" role="2OqNvi">
-                        <ref role="37wK5l" to="2rho:6aQaNXUb8h" resolve="membersDirect" />
-                      </node>
                       <node concept="2OqwBi" id="7FkLcyz8gpi" role="2Oq$k0">
                         <node concept="1PxgMI" id="3DiW6qrG94h" role="2Oq$k0">
                           <ref role="1PxNhF" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
@@ -1052,6 +1045,9 @@
                           <ref role="37wK5l" to="2rho:3bHYGwztGSo" resolve="getSUDeclaration" />
                         </node>
                       </node>
+                      <node concept="2qgKlT" id="1Nl0v8EP7Kq" role="2OqNvi">
+                        <ref role="37wK5l" to="2rho:7TdHRrCpjWZ" resolve="membersIncludingTransparent" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -1130,271 +1126,6 @@
         </node>
       </node>
     </node>
-    <node concept="nKS2y" id="7ya9dte0lC_" role="1MLUbF">
-      <node concept="3clFbS" id="7ya9dte0lCA" role="2VODD2">
-        <node concept="3clFbF" id="7ya9dte0mhY" role="3cqZAp">
-          <node concept="2OqwBi" id="7ya9dte0njB" role="3clFbG">
-            <node concept="2OqwBi" id="7ya9dte0mtJ" role="2Oq$k0">
-              <node concept="nLn13" id="7ya9dte0mhX" role="2Oq$k0" />
-              <node concept="2Xjw5R" id="7ya9dte0mNt" role="2OqNvi">
-                <node concept="1xMEDy" id="7ya9dte0mNv" role="1xVPHs">
-                  <node concept="chp4Y" id="7ya9dte0mYo" role="ri$Ld">
-                    <ref role="cht4Q" to="x27k:5jyom5fOqJ1" resolve="ExternalModule" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3x8VRR" id="7ya9dte0nVK" role="2OqNvi" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="1M2fIO" id="1$5WwmOryjl">
-    <ref role="1M2myG" to="clbe:1$5WwmOqNKi" resolve="InnerSUDeclarationRef" />
-    <node concept="1N5Pfh" id="1$5WwmOrzWG" role="1Mr941">
-      <ref role="1N5Vy1" to="clbe:1$5WwmOqNMe" />
-      <node concept="1MUpDS" id="1$5WwmOrzXG" role="1N6uqs">
-        <node concept="3clFbS" id="1$5WwmOrzXI" role="2VODD2">
-          <node concept="3cpWs8" id="6QawkaIrPfE" role="3cqZAp">
-            <node concept="3cpWsn" id="6QawkaIrPfH" role="3cpWs9">
-              <property role="TrG5h" value="res" />
-              <node concept="2I9FWS" id="6QawkaIrPfC" role="1tU5fm">
-                <ref role="2I9WkF" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
-              </node>
-              <node concept="2ShNRf" id="6QawkaIrT8t" role="33vP2m">
-                <node concept="2T8Vx0" id="6QawkaIrVtq" role="2ShVmc">
-                  <node concept="2I9FWS" id="6QawkaIrVtt" role="2T96Bj">
-                    <ref role="2I9WkF" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbJ" id="1$5WwmOr$12" role="3cqZAp">
-            <node concept="3clFbS" id="1$5WwmOr$13" role="3clFbx">
-              <node concept="3cpWs8" id="1$5WwmOr$14" role="3cqZAp">
-                <node concept="3cpWsn" id="1$5WwmOr$15" role="3cpWs9">
-                  <property role="TrG5h" value="en" />
-                  <node concept="3Tqbb2" id="1$5WwmOr$16" role="1tU5fm">
-                    <ref role="ehGHo" to="mj1l:40tXLnqhyKc" resolve="GenericDotExpression" />
-                  </node>
-                  <node concept="1PxgMI" id="1$5WwmOr$17" role="33vP2m">
-                    <ref role="1PxNhF" to="mj1l:40tXLnqhyKc" resolve="GenericDotExpression" />
-                    <node concept="21POm0" id="1$5WwmOr$18" role="1PxMeX" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3cpWs8" id="1$5WwmOr$19" role="3cqZAp">
-                <node concept="3cpWsn" id="1$5WwmOr$1a" role="3cpWs9">
-                  <property role="TrG5h" value="ct" />
-                  <node concept="3Tqbb2" id="1$5WwmOr$1b" role="1tU5fm" />
-                  <node concept="2OqwBi" id="1$5WwmOr$1c" role="33vP2m">
-                    <node concept="2OqwBi" id="1$5WwmOr$1d" role="2Oq$k0">
-                      <node concept="37vLTw" id="1$5WwmOr$1e" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1$5WwmOr$15" resolve="en" />
-                      </node>
-                      <node concept="3TrEf2" id="1$5WwmOr$1f" role="2OqNvi">
-                        <ref role="3Tt5mk" to="mj1l:6iIoqg1yDLg" />
-                      </node>
-                    </node>
-                    <node concept="3JvlWi" id="1$5WwmOr$1g" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbJ" id="1$5WwmOr$1h" role="3cqZAp">
-                <node concept="3clFbS" id="1$5WwmOr$1i" role="3clFbx">
-                  <node concept="3clFbF" id="6QawkaIrY4n" role="3cqZAp">
-                    <node concept="2OqwBi" id="6QawkaIrZDu" role="3clFbG">
-                      <node concept="37vLTw" id="6QawkaIrY4l" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6QawkaIrPfH" resolve="res" />
-                      </node>
-                      <node concept="X8dFx" id="6QawkaIs3QV" role="2OqNvi">
-                        <node concept="2OqwBi" id="1$5WwmOrQw1" role="25WWJ7">
-                          <node concept="2OqwBi" id="1$5WwmOr$1k" role="2Oq$k0">
-                            <node concept="2OqwBi" id="1$5WwmOr$1l" role="2Oq$k0">
-                              <node concept="1PxgMI" id="1$5WwmOr$1m" role="2Oq$k0">
-                                <ref role="1PxNhF" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
-                                <node concept="37vLTw" id="1$5WwmOr$1n" role="1PxMeX">
-                                  <ref role="3cqZAo" node="1$5WwmOr$1a" resolve="ct" />
-                                </node>
-                              </node>
-                              <node concept="2qgKlT" id="1$5WwmOr$1o" role="2OqNvi">
-                                <ref role="37wK5l" to="2rho:3bHYGwztGSo" resolve="getSUDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="3Tsc0h" id="1$5WwmOrKvE" role="2OqNvi">
-                              <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
-                            </node>
-                          </node>
-                          <node concept="v3k3i" id="1$5WwmOsa4A" role="2OqNvi">
-                            <node concept="chp4Y" id="1$5WwmOse$1" role="v3oSu">
-                              <ref role="cht4Q" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2OqwBi" id="1$5WwmOr$1q" role="3clFbw">
-                  <node concept="37vLTw" id="1$5WwmOr$1r" role="2Oq$k0">
-                    <ref role="3cqZAo" node="1$5WwmOr$1a" resolve="ct" />
-                  </node>
-                  <node concept="1mIQ4w" id="1$5WwmOr$1s" role="2OqNvi">
-                    <node concept="chp4Y" id="1$5WwmOr$1t" role="cj9EA">
-                      <ref role="cht4Q" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3eNFk2" id="1$5WwmOr$1u" role="3eNLev">
-                  <node concept="1Wc70l" id="1$5WwmOr$1v" role="3eO9$A">
-                    <node concept="2OqwBi" id="1$5WwmOr$1w" role="3uHU7w">
-                      <node concept="2OqwBi" id="1$5WwmOr$1x" role="2Oq$k0">
-                        <node concept="1PxgMI" id="1$5WwmOr$1y" role="2Oq$k0">
-                          <ref role="1PxNhF" to="yq40:fwMInzpHoK" resolve="PointerType" />
-                          <node concept="37vLTw" id="1$5WwmOr$1z" role="1PxMeX">
-                            <ref role="3cqZAo" node="1$5WwmOr$1a" resolve="ct" />
-                          </node>
-                        </node>
-                        <node concept="3TrEf2" id="1$5WwmOr$1$" role="2OqNvi">
-                          <ref role="3Tt5mk" to="c4fa:6IWRcVPT6tm" />
-                        </node>
-                      </node>
-                      <node concept="1mIQ4w" id="1$5WwmOr$1_" role="2OqNvi">
-                        <node concept="chp4Y" id="1$5WwmOr$1A" role="cj9EA">
-                          <ref role="cht4Q" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="1$5WwmOr$1B" role="3uHU7B">
-                      <node concept="37vLTw" id="1$5WwmOr$1C" role="2Oq$k0">
-                        <ref role="3cqZAo" node="1$5WwmOr$1a" resolve="ct" />
-                      </node>
-                      <node concept="1mIQ4w" id="1$5WwmOr$1D" role="2OqNvi">
-                        <node concept="chp4Y" id="1$5WwmOr$1E" role="cj9EA">
-                          <ref role="cht4Q" to="yq40:fwMInzpHoK" resolve="PointerType" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbS" id="1$5WwmOr$1F" role="3eOfB_">
-                    <node concept="3clFbF" id="6QawkaIsd31" role="3cqZAp">
-                      <node concept="2OqwBi" id="6QawkaIsd32" role="3clFbG">
-                        <node concept="37vLTw" id="6QawkaIsd33" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6QawkaIrPfH" resolve="res" />
-                        </node>
-                        <node concept="X8dFx" id="6QawkaIsd34" role="2OqNvi">
-                          <node concept="2OqwBi" id="1$5WwmOsA3C" role="25WWJ7">
-                            <node concept="2OqwBi" id="1$5WwmOr$1H" role="2Oq$k0">
-                              <node concept="2OqwBi" id="1$5WwmOr$1I" role="2Oq$k0">
-                                <node concept="1PxgMI" id="1$5WwmOr$1J" role="2Oq$k0">
-                                  <ref role="1PxNhF" to="clbe:3bHYGwzt_Ut" resolve="SUType" />
-                                  <node concept="2OqwBi" id="1$5WwmOr$1K" role="1PxMeX">
-                                    <node concept="1PxgMI" id="1$5WwmOr$1L" role="2Oq$k0">
-                                      <ref role="1PxNhF" to="yq40:fwMInzpHoK" resolve="PointerType" />
-                                      <node concept="37vLTw" id="1$5WwmOr$1M" role="1PxMeX">
-                                        <ref role="3cqZAo" node="1$5WwmOr$1a" resolve="ct" />
-                                      </node>
-                                    </node>
-                                    <node concept="3TrEf2" id="1$5WwmOr$1N" role="2OqNvi">
-                                      <ref role="3Tt5mk" to="c4fa:6IWRcVPT6tm" />
-                                    </node>
-                                  </node>
-                                </node>
-                                <node concept="2qgKlT" id="1$5WwmOr$1O" role="2OqNvi">
-                                  <ref role="37wK5l" to="2rho:3bHYGwztGSo" resolve="getSUDeclaration" />
-                                </node>
-                              </node>
-                              <node concept="3Tsc0h" id="1$5WwmOsy1L" role="2OqNvi">
-                                <ref role="3TtcxE" to="clbe:6a5SBPfXXIi" />
-                              </node>
-                            </node>
-                            <node concept="v3k3i" id="1$5WwmOsBjJ" role="2OqNvi">
-                              <node concept="chp4Y" id="1$5WwmOsBCX" role="v3oSu">
-                                <ref role="cht4Q" to="clbe:6a5SBPfXGBP" resolve="SUDeclaration" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2OqwBi" id="1$5WwmOr$1Q" role="3clFbw">
-              <node concept="21POm0" id="1$5WwmOr$1R" role="2Oq$k0" />
-              <node concept="1mIQ4w" id="1$5WwmOr$1S" role="2OqNvi">
-                <node concept="chp4Y" id="1$5WwmOr$1T" role="cj9EA">
-                  <ref role="cht4Q" to="mj1l:40tXLnqhyKc" resolve="GenericDotExpression" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWs6" id="1$5WwmOr$1U" role="3cqZAp">
-            <node concept="2OqwBi" id="6QawkaIsvfA" role="3cqZAk">
-              <node concept="37vLTw" id="6QawkaIrSCa" role="2Oq$k0">
-                <ref role="3cqZAo" node="6QawkaIrPfH" resolve="res" />
-              </node>
-              <node concept="3zZkjj" id="6QawkaIsNuu" role="2OqNvi">
-                <node concept="1bVj0M" id="6QawkaIsNux" role="23t8la">
-                  <node concept="3clFbS" id="6QawkaIsNuy" role="1bW5cS">
-                    <node concept="3clFbF" id="6QawkaIsPUm" role="3cqZAp">
-                      <node concept="3fqX7Q" id="6QawkaIsPUk" role="3clFbG">
-                        <node concept="1eOMI4" id="6QawkaIsUUz" role="3fr31v">
-                          <node concept="1Wc70l" id="6QawkaItbeu" role="1eOMHV">
-                            <node concept="2OqwBi" id="6QawkaItwRO" role="3uHU7w">
-                              <node concept="1PxgMI" id="6QawkaItnoR" role="2Oq$k0">
-                                <ref role="1PxNhF" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
-                                <node concept="37vLTw" id="6QawkaItehS" role="1PxMeX">
-                                  <ref role="3cqZAo" node="6QawkaIsNuz" resolve="it" />
-                                </node>
-                              </node>
-                              <node concept="3TrcHB" id="6QawkaINacL" role="2OqNvi">
-                                <ref role="3TsBF5" to="clbe:6QawkaIMrjd" resolve="transparent" />
-                              </node>
-                            </node>
-                            <node concept="2OqwBi" id="6QawkaIt0UX" role="3uHU7B">
-                              <node concept="37vLTw" id="6QawkaIsZ6H" role="2Oq$k0">
-                                <ref role="3cqZAo" node="6QawkaIsNuz" resolve="it" />
-                              </node>
-                              <node concept="1mIQ4w" id="6QawkaIt4bI" role="2OqNvi">
-                                <node concept="chp4Y" id="6QawkaIt7gH" role="cj9EA">
-                                  <ref role="cht4Q" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="Rh6nW" id="6QawkaIsNuz" role="1bW2Oz">
-                    <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="6QawkaIsNu$" role="1tU5fm" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="nKS2y" id="1$5WwmOryqX" role="1MLUbF">
-      <node concept="3clFbS" id="1$5WwmOryqY" role="2VODD2">
-        <node concept="3clFbF" id="1$5WwmOrywo" role="3cqZAp">
-          <node concept="2OqwBi" id="1$5WwmOrywp" role="3clFbG">
-            <node concept="nLn13" id="1$5WwmOrywq" role="2Oq$k0" />
-            <node concept="1mIQ4w" id="1$5WwmOrywr" role="2OqNvi">
-              <node concept="chp4Y" id="1$5WwmOryws" role="cj9EA">
-                <ref role="cht4Q" to="mj1l:40tXLnqhyKc" resolve="GenericDotExpression" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
   </node>
   <node concept="1M2fIO" id="2UJM6DuOSG5">
     <property role="3GE5qa" value="su.struct" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
index 7cd4fbf9c87..1ec0b1c9023 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/editor.mps
@@ -112,13 +112,6 @@
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR" />
       <concept id="1163613822479" name="jetbrains.mps.lang.editor.structure.CellMenuPart_Abstract_editedNode" flags="nn" index="3GMtW1" />
-      <concept id="1225898583838" name="jetbrains.mps.lang.editor.structure.ReadOnlyModelAccessor" flags="ng" index="1HfYo3">
-        <child id="1225898971709" name="getter" index="1Hhtcw" />
-      </concept>
-      <concept id="1225900081164" name="jetbrains.mps.lang.editor.structure.CellModel_ReadOnlyModelAccessor" flags="sg" stub="3708815482283559694" index="1HlG4h">
-        <child id="1225900141900" name="modelAccessor" index="1HlULh" />
-      </concept>
-      <concept id="1176717841777" name="jetbrains.mps.lang.editor.structure.QueryFunction_ModelAccess_Getter" flags="in" index="3TQlhw" />
       <concept id="1166049232041" name="jetbrains.mps.lang.editor.structure.AbstractComponent" flags="ng" index="1XWOmA">
         <reference id="1166049300910" name="conceptDeclaration" index="1XX52x" />
       </concept>
@@ -1014,33 +1007,6 @@
       <node concept="l2Vlx" id="7ya9dte4f3Q" role="2iSdaV" />
     </node>
   </node>
-  <node concept="24kQdi" id="1$5WwmOqNMm">
-    <ref role="1XX52x" to="clbe:1$5WwmOqNKi" resolve="InnerSUDeclarationRef" />
-    <node concept="3EZMnI" id="1$5WwmOqRKr" role="2wV5jI">
-      <node concept="1iCGBv" id="1$5WwmOqRK_" role="3EZMnx">
-        <ref role="1NtTu8" to="clbe:1$5WwmOqNMe" />
-        <node concept="1sVBvm" id="1$5WwmOqRKB" role="1sWHZn">
-          <node concept="1HlG4h" id="1$5WwmOqRKL" role="2wV5jI">
-            <node concept="1HfYo3" id="1$5WwmOqRKN" role="1HlULh">
-              <node concept="3TQlhw" id="1$5WwmOqRKP" role="1Hhtcw">
-                <node concept="3clFbS" id="1$5WwmOqRKR" role="2VODD2">
-                  <node concept="3clFbF" id="1$5WwmOrfRV" role="3cqZAp">
-                    <node concept="2OqwBi" id="1$5WwmOrfYz" role="3clFbG">
-                      <node concept="pncrf" id="1$5WwmOrfRU" role="2Oq$k0" />
-                      <node concept="3TrcHB" id="1$5WwmOrqeD" role="2OqNvi">
-                        <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="l2Vlx" id="1$5WwmOqRKu" role="2iSdaV" />
-    </node>
-  </node>
   <node concept="24kQdi" id="6QawkaHMa76">
     <property role="3GE5qa" value="su.struct" />
     <ref role="1XX52x" to="clbe:7ya9dte0iuS" resolve="AnonymousStructDeclaration" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps
index a7719de5279..76696c4f9a3 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/migration.mps
@@ -4,6 +4,8 @@
   <languages>
     <use id="90746344-04fd-4286-97d5-b46ae6a81709" name="jetbrains.mps.lang.migration" version="-1" />
     <use id="c7d5b9dd-a05f-4be2-bc73-f2e16994cc67" name="jetbrains.mps.baseLanguage.lightweightdsl" version="1" />
+    <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="0" />
+    <use id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" name="jetbrains.mps.lang.pattern" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
index 5f758eb39f8..98d7281bb18 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/structure.mps
@@ -512,20 +512,6 @@
     <property role="1pbfSe" value="963936518" />
     <ref role="1TJDcQ" node="6a5SBPfXGBP" resolve="SUDeclaration" />
   </node>
-  <node concept="1TIwiD" id="1$5WwmOqNKi">
-    <property role="TrG5h" value="InnerSUDeclarationRef" />
-    <property role="1pbfSe" value="848220649" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
-    <node concept="PrWs8" id="1$5WwmOqNMb" role="PzmwI">
-      <ref role="PrY4T" to="mj1l:40tXLnqhXcx" resolve="IGenericDotTarget" />
-    </node>
-    <node concept="1TJgyj" id="1$5WwmOqNMe" role="1TKVEi">
-      <property role="20lmBu" value="reference" />
-      <property role="20kJfa" value="ref" />
-      <property role="20lbJX" value="1" />
-      <ref role="20lvS9" node="6a5SBPfXGBP" resolve="SUDeclaration" />
-    </node>
-  </node>
   <node concept="1TIwiD" id="2CEi94edfgd">
     <property role="3GE5qa" value="su.struct" />
     <property role="TrG5h" value="ModuleContentSUDeclaration" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
index 69180a738fa..d6b0b0e5208 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/languageModels/typesystem.mps
@@ -2950,36 +2950,6 @@
       </node>
     </node>
   </node>
-  <node concept="1YbPZF" id="1$5WwmOuQr7">
-    <property role="TrG5h" value="typeof_InnerSUDeclarationRef" />
-    <node concept="3clFbS" id="1$5WwmOuQr8" role="18ibNy">
-      <node concept="1Z5TYs" id="7KLlXp7FXJu" role="3cqZAp">
-        <node concept="mw_s8" id="7KLlXp7FXJX" role="1ZfhKB">
-          <node concept="1Z2H0r" id="7KLlXp7FXJT" role="mwGJk">
-            <node concept="2OqwBi" id="7KLlXp7FXMG" role="1Z2MuG">
-              <node concept="1YBJjd" id="7KLlXp7FXKt" role="2Oq$k0">
-                <ref role="1YBMHb" node="1$5WwmOuQra" resolve="innerSUDeclarationRef" />
-              </node>
-              <node concept="3TrEf2" id="7KLlXp7FY67" role="2OqNvi">
-                <ref role="3Tt5mk" to="clbe:1$5WwmOqNMe" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="mw_s8" id="7KLlXp7FXJx" role="1ZfhK$">
-          <node concept="1Z2H0r" id="7KLlXp7FX$Z" role="mwGJk">
-            <node concept="1YBJjd" id="7KLlXp7FX_D" role="1Z2MuG">
-              <ref role="1YBMHb" node="1$5WwmOuQra" resolve="innerSUDeclarationRef" />
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1YaCAy" id="1$5WwmOuQra" role="1YuTPh">
-      <property role="TrG5h" value="innerSUDeclarationRef" />
-      <ref role="1YaFvo" to="clbe:1$5WwmOqNKi" resolve="InnerSUDeclarationRef" />
-    </node>
-  </node>
   <node concept="1YbPZF" id="7KLlXp7FY9T">
     <property role="TrG5h" value="typeof_AnonymousStructDeclaration" />
     <property role="3GE5qa" value="su.struct" />
diff --git a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl
index ed4c7e751ce..11d76b8d8f3 100644
--- a/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl
+++ b/code/languages/com.mbeddr.core/languages/com.mbeddr.core.udt/udt.mpl
@@ -147,6 +147,7 @@
     <language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" fqName="jetbrains.mps.lang.intentions" version="0" />
     <language id="90746344-04fd-4286-97d5-b46ae6a81709" fqName="jetbrains.mps.lang.migration" version="0" />
     <language id="d4615e3b-d671-4ba9-af01-2b78369b0ba7" fqName="jetbrains.mps.lang.pattern" version="0" />
+    <language id="28f9e497-3b42-4291-aeba-0a1039153ab1" fqName="jetbrains.mps.lang.plugin" version="0" />
     <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" fqName="jetbrains.mps.lang.quotation" version="0" />
     <language id="0eddeefa-c2d6-4437-bc2c-de50fd4ce470" fqName="jetbrains.mps.lang.script" version="0" />
     <language id="13744753-c81f-424a-9c1b-cf8943bf4e86" fqName="jetbrains.mps.lang.sharedConcepts" version="0" />
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/anonymous_member.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/anonymous_member.mps
deleted file mode 100644
index f6a015e22ec..00000000000
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/anonymous_member.mps
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:028f3179-2429-49c7-a1e9-3479afedebac(test.ex.core.anonymous_member)">
-  <persistence version="9" />
-  <languages>
-    <devkit ref="d2a9c55c-6bdc-4cc2-97e1-4ba7552f5584(com.mbeddr.core)" />
-  </languages>
-  <imports />
-  <registry>
-    <language id="a9d69647-0840-491e-bf39-2eb0805d2011" name="com.mbeddr.core.statements">
-      <concept id="7763322639126652757" name="com.mbeddr.core.statements.structure.ITypeContainingType" flags="ng" index="2umbIr">
-        <child id="7763322639126652758" name="baseType" index="2umbIo" />
-      </concept>
-      <concept id="7254843406768833938" name="com.mbeddr.core.statements.structure.ExpressionStatement" flags="ng" index="1_9egQ">
-        <child id="7254843406768833939" name="expr" index="1_9egR" />
-      </concept>
-      <concept id="4185783222026475238" name="com.mbeddr.core.statements.structure.LocalVariableDeclaration" flags="ng" index="3XIRlf" />
-      <concept id="4185783222026475861" name="com.mbeddr.core.statements.structure.StatementList" flags="ng" index="3XIRFW">
-        <child id="4185783222026475862" name="statements" index="3XIRFZ" />
-      </concept>
-      <concept id="4185783222026464515" name="com.mbeddr.core.statements.structure.Statement" flags="ng" index="3XISUE" />
-      <concept id="2093108837558113914" name="com.mbeddr.core.statements.structure.LocalVarRef" flags="ng" index="3ZVu4v">
-        <reference id="2093108837558124071" name="var" index="3ZVs_2" />
-      </concept>
-    </language>
-    <language id="2d7fadf5-33f6-4e80-a78f-0f739add2bde" name="com.mbeddr.core.buildconfig">
-      <concept id="5046689135693761556" name="com.mbeddr.core.buildconfig.structure.Binary" flags="ng" index="2eOfOj">
-        <child id="5046689135693761559" name="referencedModules" index="2eOfOg" />
-      </concept>
-      <concept id="5046689135693761554" name="com.mbeddr.core.buildconfig.structure.Executable" flags="ng" index="2eOfOl">
-        <property id="3431613015799084476" name="isTest" index="iO3LB" />
-      </concept>
-      <concept id="7717755763392524104" name="com.mbeddr.core.buildconfig.structure.BuildConfiguration" flags="ng" index="2v9HqL">
-        <child id="5046689135694070731" name="binaries" index="2ePNbc" />
-        <child id="5323740605968447026" name="target" index="2AWWZH" />
-      </concept>
-      <concept id="7717755763392524107" name="com.mbeddr.core.buildconfig.structure.ModuleRef" flags="ng" index="2v9HqM">
-        <reference id="7717755763392524108" name="module" index="2v9HqP" />
-      </concept>
-      <concept id="5323740605968447022" name="com.mbeddr.core.buildconfig.structure.DesktopPlatform" flags="ng" index="2AWWZL">
-        <property id="5323740605968447025" name="compilerOptions" index="2AWWZI" />
-        <property id="5323740605968447024" name="compiler" index="2AWWZJ" />
-        <property id="3963667026125442601" name="gdb" index="3r8Kw1" />
-        <property id="3963667026125442676" name="make" index="3r8Kxs" />
-      </concept>
-      <concept id="2736179788492003936" name="com.mbeddr.core.buildconfig.structure.IDebuggablePlatform" flags="ng" index="1FkSt_">
-        <property id="2736179788492003937" name="debugOptions" index="1FkSt$" />
-      </concept>
-    </language>
-    <language id="3bf5377a-e904-4ded-9754-5a516023bfaa" name="com.mbeddr.core.pointers">
-      <concept id="6113173064528067332" name="com.mbeddr.core.pointers.structure.StringType" flags="ng" index="Pu267" />
-      <concept id="5679441017214012545" name="com.mbeddr.core.pointers.structure.ArrayType" flags="ng" index="3J0A42" />
-    </language>
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" name="com.mbeddr.core.udt">
-      <concept id="9101132143320200657" name="com.mbeddr.core.udt.structure.SUContent" flags="ng" index="2mccaB" />
-      <concept id="3117609929518446049" name="com.mbeddr.core.udt.structure.AbstractBitType" flags="ng" index="2ArCLn">
-        <property id="3117609929518737717" name="width" index="2Asx23" />
-      </concept>
-      <concept id="1803113332147436562" name="com.mbeddr.core.udt.structure.InnerSUDeclarationRef" flags="ng" index="2HrGSn">
-        <reference id="1803113332147436686" name="ref" index="2HrGUb" />
-      </concept>
-      <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
-        <child id="7099329415459888018" name="members" index="HszBJ" />
-      </concept>
-      <concept id="8685795338482689976" name="com.mbeddr.core.udt.structure.AnonymousStructDeclaration" flags="ng" index="QyKdJ" />
-      <concept id="8685795338482702883" name="com.mbeddr.core.udt.structure.AnonymousUnionDeclaration" flags="ng" index="QyRVO" />
-      <concept id="6183845377104662871" name="com.mbeddr.core.udt.structure.UnsignedBitType" flags="ng" index="X$FZc" />
-      <concept id="5882395403881875736" name="com.mbeddr.core.udt.structure.Member" flags="ng" index="1dpRTG" />
-      <concept id="5882395403881907205" name="com.mbeddr.core.udt.structure.UnionType" flags="ng" index="1dpZdL">
-        <reference id="5882395403881907207" name="union" index="1dpZdN" />
-      </concept>
-      <concept id="5882395403881907066" name="com.mbeddr.core.udt.structure.UnionDeclaration" flags="ng" index="1dpZge" />
-      <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
-      <concept id="6394819151180597816" name="com.mbeddr.core.udt.structure.StructType" flags="ng" index="1sgJKr">
-        <reference id="6394819151180597817" name="struct" index="1sgJKq" />
-      </concept>
-      <concept id="7034214596253391076" name="com.mbeddr.core.udt.structure.GenericMemberRef" flags="ng" index="1E4Tgc">
-        <reference id="7034214596253391078" name="member" index="1E4Tge" />
-      </concept>
-    </language>
-    <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
-      <concept id="747084250476811597" name="com.mbeddr.core.base.structure.DefaultGenericChunkDependency" flags="ng" index="3GEVxB">
-        <reference id="747084250476878887" name="chunk" index="3GEb4d" />
-      </concept>
-    </language>
-    <language id="6d11763d-483d-4b2b-8efc-09336c1b0001" name="com.mbeddr.core.modules">
-      <concept id="6116558314501417952" name="com.mbeddr.core.modules.structure.HeaderDescriptor" flags="ng" index="rcWE1" />
-      <concept id="6116558314501417921" name="com.mbeddr.core.modules.structure.ExternalModule" flags="ng" index="rcWEw">
-        <child id="6116558314501417978" name="descriptors" index="rcWEr" />
-      </concept>
-      <concept id="6116558314501417934" name="com.mbeddr.core.modules.structure.ExternalResourceDescriptor" flags="ng" index="rcWEJ">
-        <property id="6116558314501417936" name="path" index="rcWEL" />
-      </concept>
-      <concept id="8967919205527146149" name="com.mbeddr.core.modules.structure.ReturnStatement" flags="ng" index="2BFjQ_">
-        <child id="8967919205527146150" name="expression" index="2BFjQA" />
-      </concept>
-      <concept id="8105003328814797298" name="com.mbeddr.core.modules.structure.IFunctionLike" flags="ng" index="2H9T1B">
-        <child id="5708867820623310661" name="arguments" index="1UOdpc" />
-      </concept>
-      <concept id="6437088627575722813" name="com.mbeddr.core.modules.structure.Module" flags="ng" index="N3F4X">
-        <child id="6437088627575722833" name="contents" index="N3F5h" />
-        <child id="1317894735999304826" name="imports" index="2OODSX" />
-      </concept>
-      <concept id="6437088627575722830" name="com.mbeddr.core.modules.structure.ImplementationModule" flags="ng" index="N3F5e" />
-      <concept id="6437088627575722831" name="com.mbeddr.core.modules.structure.IModuleContent" flags="ng" index="N3F5f">
-        <property id="1317894735999272944" name="exported" index="2OOxQR" />
-      </concept>
-      <concept id="6437088627575724001" name="com.mbeddr.core.modules.structure.Function" flags="ng" index="N3Fnx">
-        <child id="4185783222026475860" name="body" index="3XIRFX" />
-      </concept>
-      <concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
-      <concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
-    </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
-        <property id="1169194664001" name="name" index="TrG5h" />
-      </concept>
-    </language>
-    <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="8463282783691618440" name="com.mbeddr.core.expressions.structure.Int32tType" flags="ng" index="26Vqph" />
-      <concept id="8463282783691618435" name="com.mbeddr.core.expressions.structure.Int16tType" flags="ng" index="26Vqpq" />
-      <concept id="8463282783691618426" name="com.mbeddr.core.expressions.structure.Int8tType" flags="ng" index="26Vqqz" />
-      <concept id="3005510381523579442" name="com.mbeddr.core.expressions.structure.UnaryExpression" flags="ng" index="2aKSnQ">
-        <child id="7254843406768839760" name="expression" index="1_9fRO" />
-      </concept>
-      <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
-        <property id="2212975673976043696" name="value" index="2hmy$m" />
-      </concept>
-      <concept id="4620120465980402700" name="com.mbeddr.core.expressions.structure.GenericDotExpression" flags="ng" index="2qmXGp">
-        <child id="7034214596252529803" name="target" index="1ESnxz" />
-      </concept>
-      <concept id="318113533128716675" name="com.mbeddr.core.expressions.structure.ITyped" flags="ng" index="2C2TGh">
-        <child id="318113533128716676" name="type" index="2C2TGm" />
-      </concept>
-      <concept id="8860443239512128054" name="com.mbeddr.core.expressions.structure.Type" flags="ng" index="3TlMgo">
-        <property id="2941277002445651368" name="const" index="2c7vTL" />
-        <property id="2941277002448691247" name="volatile" index="2caQfQ" />
-      </concept>
-      <concept id="8860443239512128108" name="com.mbeddr.core.expressions.structure.IntType" flags="ng" index="3TlMh2" />
-      <concept id="8860443239512128103" name="com.mbeddr.core.expressions.structure.NumberLiteral" flags="ng" index="3TlMh9" />
-    </language>
-  </registry>
-  <node concept="rcWEw" id="5WwC2ssWtXx">
-    <property role="TrG5h" value="ExternalStuff" />
-    <node concept="1sgJKc" id="7ya9dtelREw" role="N3F5h">
-      <property role="TrG5h" value="aNormalStruct" />
-      <node concept="QyKdJ" id="7ya9dtelREy" role="HszBJ">
-        <property role="TrG5h" value="InnerStruct" />
-        <node concept="1dpRTG" id="7ya9dtelREz" role="HszBJ">
-          <property role="TrG5h" value="i1" />
-          <node concept="3TlMh2" id="7ya9dtelRE$" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2NXPZ9" id="7KLlXp7MSD7" role="N3F5h">
-      <property role="TrG5h" value="empty_1412685931268_1" />
-    </node>
-    <node concept="1dpZge" id="7KLlXp7NE6k" role="N3F5h">
-      <property role="TrG5h" value="aNormalUnion" />
-      <node concept="QyKdJ" id="7KLlXp7NE6U" role="HszBJ">
-        <property role="TrG5h" value="dbytes" />
-        <node concept="1dpRTG" id="7KLlXp7NE7I" role="HszBJ">
-          <property role="TrG5h" value="high" />
-          <node concept="26Vqpq" id="7KLlXp7NE9z" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NEj4" role="HszBJ">
-          <property role="TrG5h" value="low" />
-          <node concept="26Vqpq" id="7KLlXp7NEj2" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-      </node>
-      <node concept="QyKdJ" id="7KLlXp7NESk" role="HszBJ">
-        <property role="TrG5h" value="bytes" />
-        <node concept="1dpRTG" id="7KLlXp7NFBB" role="HszBJ">
-          <property role="TrG5h" value="byte1" />
-          <node concept="26Vqqz" id="7KLlXp7NFBA" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NG4u" role="HszBJ">
-          <property role="TrG5h" value="byte2" />
-          <node concept="26Vqqz" id="7KLlXp7NG4s" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NGq7" role="HszBJ">
-          <property role="TrG5h" value="byte3" />
-          <node concept="26Vqqz" id="7KLlXp7NGq5" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NGQ2" role="HszBJ">
-          <property role="TrG5h" value="byte4" />
-          <node concept="26Vqqz" id="7KLlXp7NGQ0" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-      </node>
-      <node concept="QyKdJ" id="7KLlXp7NHBP" role="HszBJ">
-        <property role="TrG5h" value="bits" />
-        <node concept="1dpRTG" id="7KLlXp7NHXC" role="HszBJ">
-          <property role="TrG5h" value="a" />
-          <node concept="X$FZc" id="7KLlXp7NHXB" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <property role="2Asx23" value="1" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NHYS" role="HszBJ">
-          <property role="TrG5h" value="b" />
-          <node concept="X$FZc" id="7KLlXp7NHYQ" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <property role="2Asx23" value="1" />
-          </node>
-        </node>
-        <node concept="1dpRTG" id="7KLlXp7NHZT" role="HszBJ">
-          <property role="TrG5h" value="c" />
-          <node concept="X$FZc" id="7KLlXp7NHZR" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <property role="2Asx23" value="1" />
-          </node>
-        </node>
-      </node>
-      <node concept="2mccaB" id="aIPzLHc_HK" role="HszBJ" />
-      <node concept="QyRVO" id="aIPzLHc_Oo" role="HszBJ">
-        <property role="TrG5h" value="nestedUnion1" />
-        <node concept="QyRVO" id="aIPzLHc_Pq" role="HszBJ">
-          <property role="TrG5h" value="nestedUnion2" />
-          <node concept="1dpRTG" id="aIPzLHc_PE" role="HszBJ">
-            <property role="TrG5h" value="a" />
-            <node concept="26Vqph" id="aIPzLHc_PD" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-        </node>
-      </node>
-      <node concept="2mccaB" id="aIPzLHc_Jk" role="HszBJ" />
-      <node concept="1dpRTG" id="7KLlXp7NEyH" role="HszBJ">
-        <property role="TrG5h" value="all" />
-        <node concept="26Vqph" id="7KLlXp7NEyF" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-        </node>
-      </node>
-    </node>
-    <node concept="rcWE1" id="5WwC2ssWwaM" role="rcWEr">
-      <property role="rcWEL" value="&quot;../../../../../include/anonymous_members.h&quot;" />
-    </node>
-  </node>
-  <node concept="N3F5e" id="5WwC2ssWwAt">
-    <property role="TrG5h" value="main" />
-    <node concept="3GEVxB" id="5WwC2ssWwBE" role="2OODSX">
-      <ref role="3GEb4d" node="5WwC2ssWtXx" resolve="ExternalStuff" />
-    </node>
-    <node concept="1sgJKc" id="5WwC2ssX6mY" role="N3F5h">
-      <property role="TrG5h" value="test" />
-      <node concept="1dpRTG" id="5WwC2ssX6zL" role="HszBJ">
-        <property role="TrG5h" value="a" />
-        <node concept="X$FZc" id="5WwC2ssX6zK" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-          <property role="2Asx23" value="1" />
-        </node>
-      </node>
-    </node>
-    <node concept="N3Fnx" id="5WwC2ssWwBG" role="N3F5h">
-      <property role="TrG5h" value="main" />
-      <property role="2OOxQR" value="true" />
-      <node concept="3XIRFW" id="5WwC2ssWwBI" role="3XIRFX">
-        <node concept="3XIRlf" id="5WwC2ssWwOs" role="3XIRFZ">
-          <property role="TrG5h" value="v" />
-          <node concept="1sgJKr" id="5WwC2ssWwOr" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <ref role="1sgJKq" node="7ya9dtelREw" resolve="aNormalStruct" />
-          </node>
-        </node>
-        <node concept="1_9egQ" id="5WwC2ssWxva" role="3XIRFZ">
-          <node concept="2qmXGp" id="5WwC2ssWxUb" role="1_9egR">
-            <node concept="1E4Tgc" id="5WwC2ssWyb0" role="1ESnxz">
-              <ref role="1E4Tge" node="7ya9dtelREz" resolve="i1" />
-            </node>
-            <node concept="2qmXGp" id="5WwC2ssWxyp" role="1_9fRO">
-              <node concept="2HrGSn" id="5WwC2ssWxMN" role="1ESnxz">
-                <ref role="2HrGUb" node="7ya9dtelREy" resolve="InnerStruct" />
-              </node>
-              <node concept="3ZVu4v" id="5WwC2ssWxv8" role="1_9fRO">
-                <ref role="3ZVs_2" node="5WwC2ssWwOs" resolve="v" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3XISUE" id="5WwC2ssWUWR" role="3XIRFZ" />
-        <node concept="3XIRlf" id="5WwC2ssWVlt" role="3XIRFZ">
-          <property role="TrG5h" value="u" />
-          <node concept="1dpZdL" id="5WwC2ssWVlr" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <ref role="1dpZdN" node="7KLlXp7NE6k" resolve="aNormalUnion" />
-          </node>
-        </node>
-        <node concept="1_9egQ" id="5WwC2ssWVV3" role="3XIRFZ">
-          <node concept="2qmXGp" id="5WwC2ssWWZt" role="1_9egR">
-            <node concept="1E4Tgc" id="5WwC2ssWXgi" role="1ESnxz">
-              <ref role="1E4Tge" node="7KLlXp7NFBB" resolve="byte1" />
-            </node>
-            <node concept="2qmXGp" id="5WwC2ssWVYi" role="1_9fRO">
-              <node concept="2HrGSn" id="5WwC2ssWWRB" role="1ESnxz">
-                <ref role="2HrGUb" node="7KLlXp7NESk" resolve="bytes" />
-              </node>
-              <node concept="3ZVu4v" id="5WwC2ssWVV1" role="1_9fRO">
-                <ref role="3ZVs_2" node="5WwC2ssWVlt" resolve="u" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1_9egQ" id="5WwC2ssWXJV" role="3XIRFZ">
-          <node concept="2qmXGp" id="5WwC2ssWYbN" role="1_9egR">
-            <node concept="1E4Tgc" id="5WwC2ssWYtq" role="1ESnxz">
-              <ref role="1E4Tge" node="7KLlXp7NHXC" resolve="a" />
-            </node>
-            <node concept="2qmXGp" id="5WwC2ssWXNa" role="1_9fRO">
-              <node concept="2HrGSn" id="5WwC2ssWY4c" role="1ESnxz">
-                <ref role="2HrGUb" node="7KLlXp7NHBP" resolve="bits" />
-              </node>
-              <node concept="3ZVu4v" id="5WwC2ssWXJT" role="1_9fRO">
-                <ref role="3ZVs_2" node="5WwC2ssWVlt" resolve="u" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3XISUE" id="aIPzLHc_UG" role="3XIRFZ" />
-        <node concept="1_9egQ" id="aIPzLHcAsj" role="3XIRFZ">
-          <node concept="2qmXGp" id="aIPzLHcAue" role="1_9egR">
-            <node concept="2HrGSn" id="aIPzLHcAy$" role="1ESnxz">
-              <ref role="2HrGUb" node="aIPzLHc_Oo" resolve="nestedUnion1" />
-            </node>
-            <node concept="3ZVu4v" id="aIPzLHcAsh" role="1_9fRO">
-              <ref role="3ZVs_2" node="5WwC2ssWVlt" resolve="u" />
-            </node>
-          </node>
-        </node>
-        <node concept="1_9egQ" id="aIPzLHcAbD" role="3XIRFZ">
-          <node concept="2qmXGp" id="aIPzLHcAjX" role="1_9egR">
-            <node concept="2HrGSn" id="aIPzLHcAmW" role="1ESnxz">
-              <ref role="2HrGUb" node="aIPzLHc_Pq" resolve="nestedUnion2" />
-            </node>
-            <node concept="2qmXGp" id="aIPzLHcAd$" role="1_9fRO">
-              <node concept="2HrGSn" id="aIPzLHcAh8" role="1ESnxz">
-                <ref role="2HrGUb" node="aIPzLHc_Oo" resolve="nestedUnion1" />
-              </node>
-              <node concept="3ZVu4v" id="aIPzLHcAbB" role="1_9fRO">
-                <ref role="3ZVs_2" node="5WwC2ssWVlt" resolve="u" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1_9egQ" id="aIPzLHcA_d" role="3XIRFZ">
-          <node concept="2qmXGp" id="aIPzLHcAPe" role="1_9egR">
-            <node concept="1E4Tgc" id="aIPzLHcASU" role="1ESnxz">
-              <ref role="1E4Tge" node="aIPzLHc_PE" resolve="a" />
-            </node>
-            <node concept="2qmXGp" id="aIPzLHcAIK" role="1_9fRO">
-              <node concept="2HrGSn" id="aIPzLHcAM6" role="1ESnxz">
-                <ref role="2HrGUb" node="aIPzLHc_Pq" resolve="nestedUnion2" />
-              </node>
-              <node concept="2qmXGp" id="aIPzLHcAB8" role="1_9fRO">
-                <node concept="2HrGSn" id="aIPzLHcAFG" role="1ESnxz">
-                  <ref role="2HrGUb" node="aIPzLHc_Oo" resolve="nestedUnion1" />
-                </node>
-                <node concept="3ZVu4v" id="aIPzLHcA_b" role="1_9fRO">
-                  <ref role="3ZVs_2" node="5WwC2ssWVlt" resolve="u" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3XISUE" id="aIPzLHcAVQ" role="3XIRFZ" />
-        <node concept="2BFjQ_" id="5WwC2ssWwBQ" role="3XIRFZ">
-          <node concept="3TlMh9" id="5WwC2ssWwBR" role="2BFjQA">
-            <property role="2hmy$m" value="0" />
-          </node>
-        </node>
-      </node>
-      <node concept="26Vqph" id="5WwC2ssWwBK" role="2C2TGm">
-        <property role="2caQfQ" value="false" />
-        <property role="2c7vTL" value="false" />
-      </node>
-      <node concept="19RgSI" id="5WwC2ssWwBL" role="1UOdpc">
-        <property role="TrG5h" value="argc" />
-        <node concept="26Vqph" id="5WwC2ssWwBM" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-        </node>
-      </node>
-      <node concept="19RgSI" id="5WwC2ssWwBN" role="1UOdpc">
-        <property role="TrG5h" value="argv" />
-        <node concept="3J0A42" id="5WwC2ssWwBO" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-          <node concept="Pu267" id="5WwC2ssWwBP" role="2umbIo">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node concept="2v9HqL" id="5WwC2ssWys8">
-    <node concept="2AWWZL" id="5WwC2ssWys9" role="2AWWZH">
-      <property role="2AWWZJ" value="gcc" />
-      <property role="2AWWZI" value="-std=c99" />
-      <property role="1FkSt$" value="-g" />
-      <property role="3r8Kxs" value="make" />
-      <property role="3r8Kw1" value="gdb" />
-    </node>
-    <node concept="2eOfOl" id="5WwC2ssWysb" role="2ePNbc">
-      <property role="iO3LB" value="false" />
-      <property role="TrG5h" value="test" />
-      <node concept="2v9HqM" id="5WwC2ssWysf" role="2eOfOg">
-        <ref role="2v9HqP" node="5WwC2ssWwAt" resolve="main" />
-      </node>
-      <node concept="2v9HqM" id="5WwC2ssWysl" role="2eOfOg">
-        <ref role="2v9HqP" node="5WwC2ssWtXx" resolve="ExternalStuff" />
-      </node>
-    </node>
-  </node>
-</model>
-
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps
index fa7d51624ad..47439491d06 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/structsAndEnums.mps
@@ -90,9 +90,6 @@
       <concept id="3117609929518446049" name="com.mbeddr.core.udt.structure.AbstractBitType" flags="ng" index="2ArCLn">
         <property id="3117609929518737717" name="width" index="2Asx23" />
       </concept>
-      <concept id="1803113332147436562" name="com.mbeddr.core.udt.structure.InnerSUDeclarationRef" flags="ng" index="2HrGSn">
-        <reference id="1803113332147436686" name="ref" index="2HrGUb" />
-      </concept>
       <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
         <child id="7099329415459888018" name="members" index="HszBJ" />
       </concept>
@@ -2253,13 +2250,8 @@
               <node concept="1E4Tgc" id="6QawkaKiJbx" role="1ESnxz">
                 <ref role="1E4Tge" node="6QawkaKiJ5F" resolve="a" />
               </node>
-              <node concept="2qmXGp" id="6QawkaKiJ8I" role="1_9fRO">
-                <node concept="2HrGSn" id="6QawkaKiJ9C" role="1ESnxz">
-                  <ref role="2HrGUb" node="6QawkaKiJ4Q" resolve="Inner" />
-                </node>
-                <node concept="3ZVu4v" id="6QawkaKiJ8_" role="1_9fRO">
-                  <ref role="3ZVs_2" node="6QawkaJVOQZ" resolve="o" />
-                </node>
+              <node concept="3ZVu4v" id="6QawkaKiJ8_" role="1_9fRO">
+                <ref role="3ZVs_2" node="6QawkaJVOQZ" resolve="o" />
               </node>
             </node>
           </node>
@@ -2273,13 +2265,8 @@
               <node concept="1E4Tgc" id="6QawkaKiJrh" role="1ESnxz">
                 <ref role="1E4Tge" node="6QawkaKiJ5F" resolve="a" />
               </node>
-              <node concept="2qmXGp" id="6QawkaKiJk7" role="1_9fRO">
-                <node concept="2HrGSn" id="6QawkaKiJnh" role="1ESnxz">
-                  <ref role="2HrGUb" node="6QawkaKiJ4Q" resolve="Inner" />
-                </node>
-                <node concept="3ZVu4v" id="6QawkaKiJjZ" role="1_9fRO">
-                  <ref role="3ZVs_2" node="6QawkaJVOQZ" resolve="o" />
-                </node>
+              <node concept="3ZVu4v" id="6QawkaKiJjZ" role="1_9fRO">
+                <ref role="3ZVs_2" node="6QawkaJVOQZ" resolve="o" />
               </node>
             </node>
           </node>
diff --git a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps
index 8be985241f0..94c6672f3ec 100644
--- a/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ex.core/test/ex/core/unions.mps
@@ -70,9 +70,6 @@
         <reference id="4202685725779391329" name="element" index="2xZoc7" />
         <child id="4202685725779390438" name="value" index="2xZpY0" />
       </concept>
-      <concept id="1803113332147436562" name="com.mbeddr.core.udt.structure.InnerSUDeclarationRef" flags="ng" index="2HrGSn">
-        <reference id="1803113332147436686" name="ref" index="2HrGUb" />
-      </concept>
       <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
         <child id="7099329415459888018" name="members" index="HszBJ" />
       </concept>
@@ -367,17 +364,12 @@
           <node concept="3TlMh9" id="7halHeUxTBM" role="2N2GHh">
             <property role="2hmy$m" value="10" />
           </node>
-          <node concept="2qmXGp" id="7halHeUxTAM" role="2N2GHg">
-            <node concept="1E4Tgc" id="7halHeUxTAN" role="1ESnxz">
+          <node concept="2qmXGp" id="7halHeUxTAO" role="2N2GHg">
+            <node concept="1E4Tgc" id="1Nl0v8EKcu6" role="1ESnxz">
               <ref role="1E4Tge" node="1JA5qgmxn1Z" resolve="b" />
             </node>
-            <node concept="2qmXGp" id="7halHeUxTAO" role="1_9fRO">
-              <node concept="2HrGSn" id="7halHeUxTAP" role="1ESnxz">
-                <ref role="2HrGUb" node="1JA5qgmxn1B" resolve="inner" />
-              </node>
-              <node concept="3ZVu4v" id="7halHeUxTAQ" role="1_9fRO">
-                <ref role="3ZVs_2" node="1JA5qgmxngO" resolve="iu1" />
-              </node>
+            <node concept="3ZVu4v" id="7halHeUxTAQ" role="1_9fRO">
+              <ref role="3ZVs_2" node="1JA5qgmxngO" resolve="iu1" />
             </node>
           </node>
         </node>
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
index 01d95eaeafd..81e5e374581 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/models/tests1@tests.mps
@@ -261,9 +261,6 @@
       <concept id="5947739078127951575" name="com.mbeddr.core.udt.structure.Enum2Int" flags="ng" index="2a30fU">
         <child id="5947739078127951576" name="expr" index="2a30fP" />
       </concept>
-      <concept id="9101132143320200657" name="com.mbeddr.core.udt.structure.SUContent" flags="ng" index="2mccaB">
-        <property id="7893263420320494797" name="transparent" index="33gNmf" />
-      </concept>
       <concept id="6116558314501347857" name="com.mbeddr.core.udt.structure.TypeDef" flags="ng" index="rcJHK">
         <child id="6116558314501347862" name="original" index="rcJHR" />
       </concept>
@@ -277,9 +274,6 @@
       <concept id="3117609929518446049" name="com.mbeddr.core.udt.structure.AbstractBitType" flags="ng" index="2ArCLn">
         <property id="3117609929518737717" name="width" index="2Asx23" />
       </concept>
-      <concept id="1803113332147436562" name="com.mbeddr.core.udt.structure.InnerSUDeclarationRef" flags="ng" index="2HrGSn">
-        <reference id="1803113332147436686" name="ref" index="2HrGUb" />
-      </concept>
       <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
         <child id="7099329415459888018" name="members" index="HszBJ" />
       </concept>
@@ -24142,304 +24136,6 @@
       </node>
     </node>
   </node>
-  <node concept="1lH9Xt" id="7ya9dte44TX">
-    <property role="TrG5h" value="AnonymousMembersTest" />
-    <node concept="1qefOq" id="7ya9dte48kJ" role="1SKRRt">
-      <node concept="rcWEw" id="7ya9dte48kM" role="1qenE9">
-        <property role="TrG5h" value="dummy" />
-        <node concept="1sgJKc" id="7ya9dte48lJ" role="N3F5h">
-          <property role="TrG5h" value="a" />
-          <node concept="2mccaB" id="7ya9dte7kzi" role="HszBJ" />
-          <node concept="QyKdJ" id="7ya9dte4eUI" role="HszBJ">
-            <property role="TrG5h" value="s" />
-            <node concept="1dpRTG" id="7ya9dte7kxW" role="HszBJ">
-              <property role="TrG5h" value="i1" />
-              <node concept="3TlMh2" id="7ya9dte7kxV" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1dpZge" id="7ya9dte7U2l" role="N3F5h">
-          <property role="TrG5h" value="b" />
-          <node concept="QyKdJ" id="7ya9dte7U2z" role="HszBJ">
-            <property role="TrG5h" value="inner1" />
-            <node concept="1dpRTG" id="7ya9dte7U2B" role="HszBJ">
-              <property role="TrG5h" value="a" />
-              <node concept="3TlMh2" id="7ya9dte7U2A" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dte7U4D" role="HszBJ">
-              <property role="TrG5h" value="b" />
-              <node concept="3TlMh2" id="7ya9dte7U4B" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dte7U5k" role="HszBJ">
-              <property role="TrG5h" value="c" />
-              <node concept="3TlMh2" id="7ya9dte7U5i" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="QyKdJ" id="7ya9dte7U67" role="HszBJ">
-            <property role="TrG5h" value="inner2" />
-            <node concept="1dpRTG" id="7ya9dte7Wcm" role="HszBJ">
-              <property role="TrG5h" value="d" />
-              <node concept="3TlMh2" id="7ya9dte7Wcl" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dte7WcT" role="HszBJ">
-              <property role="TrG5h" value="d" />
-              <node concept="3TlMh2" id="7ya9dte7WcR" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-              <node concept="7CXmI" id="7ya9dte7Wdn" role="lGtFl">
-                <node concept="1TM$A" id="1zouAvzW4XP" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzW4XQ" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-                <node concept="1TM$A" id="1zouAvzW4XR" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzW4XS" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="7CXmI" id="7ya9dteegQs" role="lGtFl">
-            <node concept="29bkU" id="1zouAvzWoHL" role="7EUXB">
-              <node concept="2PQEqo" id="1zouAvzWoHM" role="3lydCh">
-                <ref role="39XzEq" to="fvu6:61lw97FtLHo" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1sgJKc" id="7ya9dteegPI" role="N3F5h">
-          <property role="TrG5h" value="foo" />
-          <node concept="QyKdJ" id="7ya9dteel9I" role="HszBJ">
-            <property role="TrG5h" value="inner1" />
-            <node concept="1dpRTG" id="7ya9dteel9M" role="HszBJ">
-              <property role="TrG5h" value="a" />
-              <node concept="3TlMh2" id="7ya9dteel9L" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dteelal" role="HszBJ">
-              <property role="TrG5h" value="b" />
-              <node concept="3TlMh2" id="7ya9dteelaj" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dteelb0" role="HszBJ">
-              <property role="TrG5h" value="c" />
-              <node concept="3TlMh2" id="7ya9dteelaY" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="QyKdJ" id="7ya9dteelbN" role="HszBJ">
-            <property role="TrG5h" value="inner2" />
-            <node concept="1dpRTG" id="7ya9dteelc6" role="HszBJ">
-              <property role="TrG5h" value="a" />
-              <node concept="3TlMh2" id="7ya9dteelc5" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-              <node concept="7CXmI" id="7ya9dteeleA" role="lGtFl">
-                <node concept="1TM$A" id="1zouAvzQ$s9" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzQ$sa" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1dpRTG" id="7ya9dteele8" role="HszBJ">
-              <property role="TrG5h" value="d" />
-              <node concept="3TlMh2" id="7ya9dteele6" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="rcWE1" id="7ya9dteeleV" role="rcWEr">
-          <property role="rcWEL" value="&quot;a.h&quot;" />
-        </node>
-      </node>
-    </node>
-    <node concept="1qefOq" id="7ya9dtelRMk" role="1SKRRt">
-      <node concept="N3F5e" id="7ya9dtelRNH" role="1qenE9">
-        <property role="TrG5h" value="dummy" />
-        <node concept="3GEVxB" id="7ya9dtelRNK" role="2OODSX">
-          <ref role="3GEb4d" node="7ya9dtegY_S" resolve="ExternalTest" />
-        </node>
-        <node concept="N3Fnx" id="7ya9dtelRNN" role="N3F5h">
-          <property role="TrG5h" value="main" />
-          <property role="2OOxQR" value="true" />
-          <node concept="3XIRFW" id="7ya9dtelRNP" role="3XIRFX">
-            <node concept="3XIRlf" id="7ya9dtelS0o" role="3XIRFZ">
-              <property role="TrG5h" value="n" />
-              <node concept="1sgJKr" id="7ya9dtelS0n" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-                <ref role="1sgJKq" node="7ya9dtelREw" resolve="aNormalStruct" />
-              </node>
-            </node>
-            <node concept="1_9egQ" id="1$5WwmO$Uqf" role="3XIRFZ">
-              <node concept="2qmXGp" id="7KLlXp7MHZn" role="1_9egR">
-                <node concept="1E4Tgc" id="7KLlXp7MIf$" role="1ESnxz">
-                  <ref role="1E4Tge" node="7ya9dtelREz" resolve="i1" />
-                  <node concept="7CXmI" id="7KLlXp7MQaw" role="lGtFl">
-                    <node concept="30Omv" id="7KLlXp7MQnj" role="7EUXB">
-                      <node concept="26Vqph" id="6si$VEkrj61" role="31d$z">
-                        <property role="2caQfQ" value="false" />
-                        <property role="2c7vTL" value="false" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2qmXGp" id="1$5WwmO$UtC" role="1_9fRO">
-                  <node concept="2HrGSn" id="1$5WwmO$UWj" role="1ESnxz">
-                    <ref role="2HrGUb" node="7ya9dtelREy" resolve="InnerStruct" />
-                  </node>
-                  <node concept="3ZVu4v" id="1$5WwmO$Uqd" role="1_9fRO">
-                    <ref role="3ZVs_2" node="7ya9dtelS0o" resolve="n" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3XIRlf" id="7KLlXp7NJ1u" role="3XIRFZ">
-              <property role="TrG5h" value="u" />
-              <node concept="1dpZdL" id="7KLlXp7NJ1s" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-                <ref role="1dpZdN" node="7KLlXp7NE6k" resolve="aNormalUnion" />
-              </node>
-            </node>
-            <node concept="1_9egQ" id="7KLlXp7NJIN" role="3XIRFZ">
-              <node concept="2qmXGp" id="7KLlXp7NJMc" role="1_9egR">
-                <node concept="1E4Tgc" id="7KLlXp7NKBC" role="1ESnxz">
-                  <ref role="1E4Tge" node="7KLlXp7NEyH" resolve="all" />
-                  <node concept="7CXmI" id="7KLlXp7NM7E" role="lGtFl">
-                    <node concept="30Omv" id="7KLlXp7NNmh" role="7EUXB">
-                      <node concept="26Vqph" id="7KLlXp7NNmx" role="31d$z">
-                        <property role="2caQfQ" value="false" />
-                        <property role="2c7vTL" value="false" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3ZVu4v" id="7KLlXp7NJIL" role="1_9fRO">
-                  <ref role="3ZVs_2" node="7KLlXp7NJ1u" resolve="u" />
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="7KLlXp7O2sA" role="3XIRFZ">
-              <node concept="2qmXGp" id="7KLlXp7O358" role="1_9egR">
-                <node concept="1E4Tgc" id="7KLlXp7O3wY" role="1ESnxz">
-                  <ref role="1E4Tge" node="7KLlXp7NFBB" resolve="byte1" />
-                </node>
-                <node concept="2qmXGp" id="7KLlXp7O2vZ" role="1_9fRO">
-                  <node concept="2HrGSn" id="7KLlXp7O2WB" role="1ESnxz">
-                    <ref role="2HrGUb" node="7KLlXp7NESk" resolve="bytes" />
-                  </node>
-                  <node concept="3ZVu4v" id="7KLlXp7O2s$" role="1_9fRO">
-                    <ref role="3ZVs_2" node="7KLlXp7NJ1u" resolve="u" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="7KLlXp7NNEe" role="3XIRFZ">
-              <node concept="2qmXGp" id="7KLlXp7NOmY" role="1_9egR">
-                <node concept="1E4Tgc" id="7KLlXp7NOFL" role="1ESnxz">
-                  <ref role="1E4Tge" node="7KLlXp7NFBB" resolve="byte1" />
-                  <node concept="7CXmI" id="7KLlXp7NPYX" role="lGtFl">
-                    <node concept="30Omv" id="7KLlXp7NQQu" role="7EUXB">
-                      <node concept="26Vqqz" id="7KLlXp7NQQI" role="31d$z">
-                        <property role="2caQfQ" value="false" />
-                        <property role="2c7vTL" value="false" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2qmXGp" id="7KLlXp7NNHB" role="1_9fRO">
-                  <node concept="2HrGSn" id="7KLlXp7NO2D" role="1ESnxz">
-                    <ref role="2HrGUb" node="7KLlXp7NESk" resolve="bytes" />
-                  </node>
-                  <node concept="3ZVu4v" id="7KLlXp7NNEc" role="1_9fRO">
-                    <ref role="3ZVs_2" node="7KLlXp7NJ1u" resolve="u" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="7KLlXp7NRdP" role="3XIRFZ">
-              <node concept="2qmXGp" id="7KLlXp7NRM_" role="1_9egR">
-                <node concept="1E4Tgc" id="7KLlXp7NSaL" role="1ESnxz">
-                  <ref role="1E4Tge" node="7KLlXp7NE7I" resolve="high" />
-                  <node concept="7CXmI" id="7KLlXp7NSBJ" role="lGtFl">
-                    <node concept="30Omv" id="7KLlXp7NSYU" role="7EUXB">
-                      <node concept="26Vqpq" id="7KLlXp7NSZa" role="31d$z">
-                        <property role="2caQfQ" value="false" />
-                        <property role="2c7vTL" value="false" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2qmXGp" id="7KLlXp7NRhe" role="1_9fRO">
-                  <node concept="2HrGSn" id="7KLlXp7NRE3" role="1ESnxz">
-                    <ref role="2HrGUb" node="7KLlXp7NE6U" resolve="dbytes" />
-                  </node>
-                  <node concept="3ZVu4v" id="7KLlXp7NRdN" role="1_9fRO">
-                    <ref role="3ZVs_2" node="7KLlXp7NJ1u" resolve="u" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="2BFjQ_" id="7ya9dtelRNX" role="3XIRFZ">
-              <node concept="3TlMh9" id="7ya9dtelRNY" role="2BFjQA">
-                <property role="2hmy$m" value="0" />
-              </node>
-            </node>
-          </node>
-          <node concept="26Vqph" id="7ya9dtelRNR" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-          <node concept="19RgSI" id="7ya9dtelRNS" role="1UOdpc">
-            <property role="TrG5h" value="argc" />
-            <node concept="26Vqph" id="7ya9dtelRNT" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="19RgSI" id="7ya9dtelRNU" role="1UOdpc">
-            <property role="TrG5h" value="argv" />
-            <node concept="3J0A42" id="7ya9dtelRNV" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-              <node concept="Pu267" id="7ya9dtelRNW" role="2umbIo">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="rcWEw" id="7ya9dtegY_S">
     <property role="TrG5h" value="ExternalTest" />
     <node concept="1sgJKc" id="7ya9dtelREw" role="N3F5h">
@@ -26694,306 +26390,6 @@
       <property role="rcWEL" value="&lt;stdio.h&gt;" />
     </node>
   </node>
-  <node concept="1lH9Xt" id="6QawkaHXLAw">
-    <property role="TrG5h" value="AnoymousStructStuff" />
-    <node concept="1qefOq" id="6QawkaHXLAx" role="1SKRRt">
-      <node concept="N3F5e" id="6QawkaHXLAy" role="1qenE9">
-        <property role="TrG5h" value="AnoymousStructStuff" />
-        <node concept="1sgJKc" id="6QawkaJ7Ey8" role="N3F5h">
-          <property role="TrG5h" value="Base" />
-          <node concept="1dpRTG" id="6QawkaJ7Ey9" role="HszBJ">
-            <property role="TrG5h" value="base1" />
-            <node concept="26Vqqz" id="6QawkaJ7Eya" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="1dpRTG" id="6QawkaJ7Eyb" role="HszBJ">
-            <property role="TrG5h" value="base2" />
-            <node concept="26Vqqz" id="6QawkaJ7Eyc" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-        </node>
-        <node concept="2NXPZ9" id="6QawkaJ7EDn" role="N3F5h">
-          <property role="TrG5h" value="empty_1428580922546_3018" />
-        </node>
-        <node concept="1sgJKc" id="6QawkaIVKWp" role="N3F5h">
-          <property role="TrG5h" value="OtherStuff" />
-          <node concept="1dpRTG" id="6QawkaIVL09" role="HszBJ">
-            <property role="TrG5h" value="other1" />
-            <node concept="26Vqqz" id="6QawkaIVL0a" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="1dpRTG" id="6QawkaIVKYi" role="HszBJ">
-            <property role="TrG5h" value="other2" />
-            <node concept="26Vqqz" id="6QawkaIVKYh" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-        </node>
-        <node concept="2NXPZ9" id="6QawkaIVKSH" role="N3F5h">
-          <property role="TrG5h" value="empty_1428580225109_3012" />
-        </node>
-        <node concept="2NXPZ9" id="6QawkaJ7CeE" role="N3F5h">
-          <property role="TrG5h" value="empty_1428580906425_3017" />
-        </node>
-        <node concept="1sgJKc" id="6QawkaHX2aU" role="N3F5h">
-          <property role="TrG5h" value="Outer" />
-          <node concept="2mccaB" id="6QawkaIVL9r" role="HszBJ" />
-          <node concept="1dpRTG" id="6QawkaJ7ERJ" role="HszBJ">
-            <property role="TrG5h" value="other" />
-            <node concept="1sgJKr" id="6QawkaJ7ERI" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-              <ref role="1sgJKq" node="6QawkaIVKWp" resolve="OtherStuff" />
-            </node>
-          </node>
-          <node concept="2mccaB" id="6QawkaJ7EPe" role="HszBJ" />
-          <node concept="1dpRTG" id="6QawkaIVLhS" role="HszBJ">
-            <property role="TrG5h" value="base" />
-            <property role="33gNmf" value="true" />
-            <node concept="1sgJKr" id="6QawkaJ7EGa" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-              <ref role="1sgJKq" node="6QawkaJ7Ey8" resolve="Base" />
-            </node>
-          </node>
-          <node concept="2mccaB" id="6QawkaIVL8$" role="HszBJ" />
-          <node concept="QyKdJ" id="6QawkaHX2aX" role="HszBJ">
-            <property role="TrG5h" value="Inner" />
-            <node concept="1dpRTG" id="6QawkaHX2ba" role="HszBJ">
-              <property role="TrG5h" value="ax" />
-              <node concept="26Vqqz" id="6QawkaHX2b9" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-              <node concept="7CXmI" id="6QawkaHXS77" role="lGtFl">
-                <node concept="1TM$A" id="1zouAvzPw5m" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzPw5n" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1dpRTG" id="6QawkaHXWYi" role="HszBJ">
-              <property role="TrG5h" value="notTransparentlyVisible" />
-              <node concept="26Vqqz" id="6QawkaHXWYg" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-          </node>
-          <node concept="2mccaB" id="6QawkaIVLb3" role="HszBJ" />
-          <node concept="QyKdJ" id="6QawkaHX2VD" role="HszBJ">
-            <property role="TrG5h" value="Transparent" />
-            <property role="33gNmf" value="true" />
-            <node concept="1dpRTG" id="6QawkaHX2VE" role="HszBJ">
-              <property role="TrG5h" value="b" />
-              <node concept="26Vqqz" id="6QawkaHX2VF" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="6QawkaHXRVQ" role="HszBJ">
-              <property role="TrG5h" value="bx" />
-              <node concept="26Vqqz" id="6QawkaHXRVR" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-            </node>
-            <node concept="1dpRTG" id="6QawkaHXRVn" role="HszBJ">
-              <property role="TrG5h" value="bx" />
-              <node concept="26Vqqz" id="6QawkaHXRVl" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-              <node concept="7CXmI" id="6QawkaHXRWY" role="lGtFl">
-                <node concept="1TM$A" id="3n5vksROTqN" role="7EUXB">
-                  <node concept="2PYRI3" id="3n5vksROTqO" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-                <node concept="1TM$A" id="3n5vksROTqP" role="7EUXB">
-                  <node concept="2PYRI3" id="3n5vksROTqQ" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1dpRTG" id="6QawkaHXRXM" role="HszBJ">
-              <property role="TrG5h" value="vx" />
-              <node concept="26Vqqz" id="6QawkaHXRXK" role="2C2TGm">
-                <property role="2caQfQ" value="false" />
-                <property role="2c7vTL" value="false" />
-              </node>
-              <node concept="7CXmI" id="6QawkaHXRZT" role="lGtFl">
-                <node concept="1TM$A" id="1zouAvzVF45" role="7EUXB">
-                  <node concept="2PYRI3" id="1zouAvzVF46" role="3lydEf">
-                    <ref role="39XzEq" to="9zoj:4qSf1u1TRgo" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="2mccaB" id="6QawkaIVLcH" role="HszBJ" />
-          <node concept="1dpRTG" id="6QawkaHXS0N" role="HszBJ">
-            <property role="TrG5h" value="ax" />
-            <node concept="26Vqqz" id="6QawkaHXS0L" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="1dpRTG" id="6QawkaHX2cf" role="HszBJ">
-            <property role="TrG5h" value="c" />
-            <node concept="26Vqqz" id="6QawkaHX2cd" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="1dpRTG" id="6QawkaHXRZ9" role="HszBJ">
-            <property role="TrG5h" value="vx" />
-            <node concept="26Vqqz" id="6QawkaHXRZ7" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-            </node>
-          </node>
-          <node concept="2mccaB" id="6QawkaIVLep" role="HszBJ" />
-        </node>
-        <node concept="2NXPZ9" id="6QawkaHXR8B" role="N3F5h">
-          <property role="TrG5h" value="empty_1428576847591_3002" />
-        </node>
-        <node concept="N3Fnx" id="6QawkaHXS2T" role="N3F5h">
-          <property role="TrG5h" value="f" />
-          <property role="2OOxQR" value="false" />
-          <node concept="19RgSI" id="3XvCV0Kdqj_" role="1UOdpc">
-            <property role="TrG5h" value="o" />
-            <node concept="1sgJKr" id="3XvCV0Kdqj$" role="2C2TGm">
-              <property role="2caQfQ" value="false" />
-              <property role="2c7vTL" value="false" />
-              <ref role="1sgJKq" node="6QawkaHX2aU" resolve="Outer" />
-            </node>
-          </node>
-          <node concept="3XIRFW" id="6QawkaHXS2V" role="3XIRFX">
-            <node concept="1_9egQ" id="6QawkaHXWV6" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaHXWVd" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsQz" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="1E4Tgc" id="6QawkaImV1X" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaHX2cf" resolve="c" />
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="6QawkaImV3p" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaImV46" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsR3" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="1E4Tgc" id="6QawkaImV5p" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaHX2VE" resolve="b" />
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="6QawkaIyMt0" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaIyMt1" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsTc" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="2HrGSn" id="6QawkaIyMt2" role="1ESnxz">
-                  <ref role="2HrGUb" node="6QawkaHX2VD" resolve="Transparent" />
-                  <node concept="7CXmI" id="6QawkaIyMt3" role="lGtFl">
-                    <node concept="39XrGg" id="1zouAvzQ$Lm" role="7EUXB">
-                      <node concept="2u4KIi" id="1zouAvzQ$Ln" role="39rjcI">
-                        <ref role="39XzEq" to="k7w5:1$5WwmOrzXG" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="6QawkaHXS4$" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaImUUM" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsTr" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="2HrGSn" id="6QawkaImUXD" role="1ESnxz">
-                  <ref role="2HrGUb" node="6QawkaHX2aX" resolve="Inner" />
-                </node>
-              </node>
-            </node>
-            <node concept="3XISUE" id="6QawkaIWB42" role="3XIRFZ" />
-            <node concept="1_9egQ" id="6QawkaIWB6N" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaIYkQ4" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsTE" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="1E4Tgc" id="6QawkaJ7EZv" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaJ7Ey9" resolve="base1" />
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="6QawkaJ7C7E" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaJ7C7L" role="1_9egR">
-                <node concept="3ZUYvv" id="3XvCV0KdsU0" role="1_9fRO">
-                  <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                </node>
-                <node concept="1E4Tgc" id="6QawkaJ7F1$" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaJ7Eyb" resolve="base2" />
-                </node>
-              </node>
-            </node>
-            <node concept="3XISUE" id="6QawkaIWB5q" role="3XIRFZ" />
-            <node concept="1_9egQ" id="6QawkaJ7F5s" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaJ7Fbg" role="1_9egR">
-                <node concept="1E4Tgc" id="6QawkaJ7Feh" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaIVL09" resolve="other1" />
-                </node>
-                <node concept="2qmXGp" id="6QawkaJ7F5z" role="1_9fRO">
-                  <node concept="3ZUYvv" id="3XvCV0KdsYr" role="1_9fRO">
-                    <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                  </node>
-                  <node concept="1E4Tgc" id="6QawkaJ7F8X" role="1ESnxz">
-                    <ref role="1E4Tge" node="6QawkaJ7ERJ" resolve="other" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="1_9egQ" id="6QawkaJ7Fi2" role="3XIRFZ">
-              <node concept="2qmXGp" id="6QawkaJ7FoK" role="1_9egR">
-                <node concept="1E4Tgc" id="6QawkaJ7Fs7" role="1ESnxz">
-                  <ref role="1E4Tge" node="6QawkaIVKYi" resolve="other2" />
-                </node>
-                <node concept="2qmXGp" id="6QawkaJ7Fi9" role="1_9fRO">
-                  <node concept="3ZUYvv" id="3XvCV0KdsZn" role="1_9fRO">
-                    <ref role="3ZUYvu" node="3XvCV0Kdqj_" resolve="o" />
-                  </node>
-                  <node concept="1E4Tgc" id="6QawkaJ7Fmb" role="1ESnxz">
-                    <ref role="1E4Tge" node="6QawkaJ7ERJ" resolve="other" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3XISUE" id="6QawkaJ7F4f" role="3XIRFZ" />
-          </node>
-          <node concept="19Rifw" id="6QawkaHXS1N" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-          </node>
-        </node>
-        <node concept="2NXPZ9" id="6QawkaHXR9j" role="N3F5h">
-          <property role="TrG5h" value="empty_1428576847911_3004" />
-        </node>
-        <node concept="7CXmI" id="6QawkaHXLD1" role="lGtFl">
-          <node concept="7OXhh" id="6QawkaId8qa" role="7EUXB" />
-        </node>
-      </node>
-    </node>
-  </node>
   <node concept="1lH9Xt" id="6Pt2vx4BAiN">
     <property role="TrG5h" value="Concat" />
     <node concept="1qefOq" id="6Pt2vx4BAjw" role="1SKRRt">
diff --git a/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps b/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps
index a84fdea9f7c..2c0f3a6374c 100644
--- a/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps
+++ b/code/languages/com.mbeddr.core/tests/test.ts.core/tests/ts/core/importing@tests.mps
@@ -61,17 +61,6 @@
       </concept>
       <concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
     </language>
-    <language id="efda956e-491e-4f00-ba14-36af2f213ecf" name="com.mbeddr.core.udt">
-      <concept id="7099329415459817973" name="com.mbeddr.core.udt.structure.SUDeclaration" flags="ng" index="HsMI8">
-        <child id="7099329415459888018" name="members" index="HszBJ" />
-      </concept>
-      <concept id="8685795338482689976" name="com.mbeddr.core.udt.structure.AnonymousStructDeclaration" flags="ng" index="QyKdJ" />
-      <concept id="5882395403881875736" name="com.mbeddr.core.udt.structure.Member" flags="ng" index="1dpRTG" />
-      <concept id="6394819151180597807" name="com.mbeddr.core.udt.structure.StructDeclaration" flags="ng" index="1sgJKc" />
-      <concept id="6394819151180597816" name="com.mbeddr.core.udt.structure.StructType" flags="ng" index="1sgJKr">
-        <reference id="6394819151180597817" name="struct" index="1sgJKq" />
-      </concept>
-    </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
       <concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ng" index="2Q9xDo">
         <child id="4459718605982007338" name="configurationItems" index="2Q9xDr" />
@@ -111,7 +100,6 @@
       </concept>
     </language>
     <language id="61c69711-ed61-4850-81d9-7714ff227fb0" name="com.mbeddr.core.expressions">
-      <concept id="8463282783691618440" name="com.mbeddr.core.expressions.structure.Int32tType" flags="ng" index="26Vqph" />
       <concept id="8463282783691618426" name="com.mbeddr.core.expressions.structure.Int8tType" flags="ng" index="26Vqqz" />
       <concept id="2212975673976017893" name="com.mbeddr.core.expressions.structure.NumericLiteral" flags="ng" index="2hns93">
         <property id="2212975673976043696" name="value" index="2hmy$m" />
@@ -157,50 +145,8 @@
         <property role="2hmy$m" value="10" />
       </node>
     </node>
-    <node concept="2NXPZ9" id="4ISByPp52YF" role="N3F5h">
-      <property role="TrG5h" value="empty_1453888721444_1" />
-    </node>
-    <node concept="1sgJKc" id="4ISByPp52Z0" role="N3F5h">
-      <property role="TrG5h" value="A" />
-      <node concept="1dpRTG" id="4ISByPp60s$" role="HszBJ">
-        <property role="TrG5h" value="a" />
-        <node concept="1sgJKr" id="4ISByPp60sz" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-          <ref role="1sgJKq" node="4ISByPp52Z0" resolve="A" />
-        </node>
-      </node>
-      <node concept="QyKdJ" id="4ISByPp7qHb" role="HszBJ">
-        <property role="TrG5h" value="q" />
-        <node concept="1dpRTG" id="4ISByPp7qHs" role="HszBJ">
-          <property role="TrG5h" value="bb" />
-          <node concept="1sgJKr" id="4ISByPp7qHr" role="2C2TGm">
-            <property role="2caQfQ" value="false" />
-            <property role="2c7vTL" value="false" />
-            <ref role="1sgJKq" node="4ISByPp52Z0" resolve="A" />
-          </node>
-        </node>
-      </node>
-      <node concept="1dpRTG" id="4ISByPp7lUI" role="HszBJ">
-        <property role="TrG5h" value="b" />
-        <node concept="26Vqph" id="4ISByPp7lUG" role="2C2TGm">
-          <property role="2caQfQ" value="false" />
-          <property role="2c7vTL" value="false" />
-        </node>
-      </node>
-    </node>
-    <node concept="2NXPZ9" id="6uZAbUKexSG" role="N3F5h">
-      <property role="TrG5h" value="empty_1364212237400_2" />
-    </node>
-    <node concept="3GEVxB" id="6YocL3sys0H" role="2OODSX">
-      <property role="3GEa6x" value="false" />
-      <ref role="3GEb4d" node="6uZAbUKexTN" resolve="M2" />
-    </node>
-    <node concept="3GEVxB" id="6YocL3syrY_" role="2OODSX">
+    <node concept="3GEVxB" id="1Nl0v8EPVcj" role="2OODSX">
       <property role="3GEa6x" value="true" />
-      <ref role="3GEb4d" node="6uZAbUKeCcu" resolve="M3" />
-    </node>
-    <node concept="3GEVxB" id="4ISByPoXsPM" role="2OODSX">
       <ref role="3GEb4d" node="6uZAbUKexTN" resolve="M2" />
     </node>
   </node>
@@ -351,9 +297,6 @@
   </node>
   <node concept="N3F5e" id="6uZAbUKexTN">
     <property role="TrG5h" value="M2" />
-    <node concept="2NXPZ9" id="6uZAbUKexTO" role="N3F5h">
-      <property role="TrG5h" value="empty_1364212442086_9" />
-    </node>
     <node concept="1S7NMz" id="6uZAbUKexTR" role="N3F5h">
       <property role="TrG5h" value="M2x" />
       <property role="2OOxQR" value="false" />
@@ -364,7 +307,7 @@
     </node>
     <node concept="1S7NMz" id="6uZAbUKexTU" role="N3F5h">
       <property role="TrG5h" value="M2y" />
-      <property role="2OOxQR" value="true" />
+      <property role="2OOxQR" value="false" />
       <node concept="26Vqqz" id="6uZAbUKexTV" role="2C2TGm">
         <property role="2caQfQ" value="false" />
         <property role="2c7vTL" value="false" />
@@ -377,6 +320,7 @@
       <property role="TrG5h" value="empty_1364212442558_11" />
     </node>
     <node concept="3GEVxB" id="17fjvcLFTT9" role="2OODSX">
+      <property role="3GEa6x" value="true" />
       <ref role="3GEb4d" node="6uZAbUKeCcu" resolve="M3" />
     </node>
   </node>
@@ -439,9 +383,6 @@
     <node concept="2NXPZ9" id="6uZAbUKf2lb" role="N3F5h">
       <property role="TrG5h" value="empty_1364212442558_11" />
     </node>
-    <node concept="3GEVxB" id="17fjvcLFTTV" role="2OODSX">
-      <ref role="3GEb4d" node="6uZAbUKexSE" resolve="M1" />
-    </node>
   </node>
   <node concept="2v9HqL" id="4ifG318a7qu">
     <node concept="2xfidK" id="2nospmWkMyC" role="2AWWZH">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
index 38adc399679..e82a165e3c4 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps
@@ -2371,15 +2371,23 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="3fqX7Q" id="3NZq_n0Jl15" role="MpTkK">
-                            <node concept="2OqwBi" id="3NZq_n0Jl3H" role="3fr31v">
-                              <node concept="37vLTw" id="3NZq_n0Jl2k" role="2Oq$k0">
+                          <node concept="1Wc70l" id="1Nl0v8EPWL7" role="MpTkK">
+                            <node concept="3y3z36" id="1Nl0v8EPWOg" role="3uHU7B">
+                              <node concept="10Nm6u" id="1Nl0v8EPWPx" role="3uHU7w" />
+                              <node concept="37vLTw" id="1Nl0v8EPWMP" role="3uHU7B">
                                 <ref role="3cqZAo" node="3NZq_n0JkPo" resolve="targetNode" />
                               </node>
-                              <node concept="liA8E" id="3NZq_n0Jl8r" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
-                                <node concept="37vLTw" id="3NZq_n0Jlag" role="37wK5m">
-                                  <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                            </node>
+                            <node concept="3fqX7Q" id="3NZq_n0Jl15" role="3uHU7w">
+                              <node concept="2OqwBi" id="3NZq_n0Jl3H" role="3fr31v">
+                                <node concept="37vLTw" id="3NZq_n0Jl2k" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="3NZq_n0JkPo" resolve="targetNode" />
+                                </node>
+                                <node concept="liA8E" id="3NZq_n0Jl8r" role="2OqNvi">
+                                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                                  <node concept="37vLTw" id="3NZq_n0Jlag" role="37wK5m">
+                                    <ref role="3cqZAo" node="3NZq_n0ImwG" resolve="currentNode" />
+                                  </node>
                                 </node>
                               </node>
                             </node>