diff --git a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps
index a36482c51..af06dc311 100644
--- a/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps
+++ b/code/diagram/languages/test.de.itemis.mps.editor.diagram.lang/languageModels/editor.mps
@@ -88,7 +88,7 @@
         <property id="1073389577007" name="text" index="3F0ifm" />
       </concept>
       <concept id="1073389658414" name="jetbrains.mps.lang.editor.structure.CellModel_Property" flags="sg" stub="730538219796134133" index="3F0A7n" />
-      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ng" index="3F0Thp">
+      <concept id="1219418625346" name="jetbrains.mps.lang.editor.structure.IStyleContainer" flags="ngI" index="3F0Thp">
         <child id="1219418656006" name="styleItem" index="3F10Kt" />
       </concept>
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY">
@@ -146,7 +146,7 @@
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
@@ -195,7 +195,7 @@
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
@@ -211,13 +211,14 @@
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
       <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
         <child id="1199569916463" name="body" index="1bW5cS" />
@@ -316,7 +317,7 @@
       <concept id="8377729485192417786" name="de.itemis.mps.editor.diagram.structure.PaletteSource_ReplaceEntry" flags="ig" index="htBPI">
         <child id="8377729485192417789" name="source" index="htBPD" />
       </concept>
-      <concept id="9064581101900867235" name="de.itemis.mps.editor.diagram.structure.IEdgeEditor" flags="ng" index="ljJFv">
+      <concept id="9064581101900867235" name="de.itemis.mps.editor.diagram.structure.IEdgeEditor" flags="ngI" index="ljJFv">
         <child id="8606559630272704940" name="dropHandler" index="FVTne" />
         <child id="621570459749703015" name="splitHandler" index="KSpTH" />
         <child id="621570459751239491" name="canSplit" index="KYgL9" />
@@ -359,7 +360,7 @@
         <child id="2531824743736393627" name="height" index="2gOmqF" />
         <child id="500099795019625833" name="shape" index="G$OdO" />
       </concept>
-      <concept id="5383048119156619323" name="de.itemis.mps.editor.diagram.structure.IDiagramElementsProvider" flags="ng" index="HB_m5">
+      <concept id="5383048119156619323" name="de.itemis.mps.editor.diagram.structure.IDiagramElementsProvider" flags="ngI" index="HB_m5">
         <child id="3155126767688717334" name="contentList" index="aCds2" />
       </concept>
       <concept id="7859343581441233262" name="de.itemis.mps.editor.diagram.structure.Parameter_AnnotationNode" flags="ng" index="2IBeSQ" />
@@ -519,7 +520,7 @@
       <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
@@ -537,7 +538,6 @@
         <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
@@ -2149,7 +2149,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="5UUX0AoLSJa" role="3uHU7B">
                                   <node concept="37vLTw" id="5UUX0AoLSJb" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5UUX0AoLSJd" resolve="it" />
+                                    <ref role="3cqZAo" node="4Jof1$wCncm" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="5UUX0AoLSJc" role="2OqNvi">
                                     <ref role="37wK5l" to="ekjq:24zrZPPB6_c" resolve="getPortName" />
@@ -2158,9 +2158,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5UUX0AoLSJd" role="1bW2Oz">
+                          <node concept="gl6BB" id="4Jof1$wCncm" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5UUX0AoLSJe" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4Jof1$wCncn" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
@@ -2206,7 +2206,7 @@
                                 </node>
                                 <node concept="2OqwBi" id="5UUX0AoLSJy" role="3uHU7B">
                                   <node concept="37vLTw" id="5UUX0AoLSJz" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="5UUX0AoLSJ_" resolve="it" />
+                                    <ref role="3cqZAo" node="4Jof1$wCnco" resolve="it" />
                                   </node>
                                   <node concept="2qgKlT" id="5UUX0AoLSJ$" role="2OqNvi">
                                     <ref role="37wK5l" to="ekjq:24zrZPPB6_c" resolve="getPortName" />
@@ -2215,9 +2215,9 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="Rh6nW" id="5UUX0AoLSJ_" role="1bW2Oz">
+                          <node concept="gl6BB" id="4Jof1$wCnco" role="1bW2Oz">
                             <property role="TrG5h" value="it" />
-                            <node concept="2jxLKc" id="5UUX0AoLSJA" role="1tU5fm" />
+                            <node concept="2jxLKc" id="4Jof1$wCncp" role="1tU5fm" />
                           </node>
                         </node>
                       </node>
diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 7d8bd934f..204da5e25 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -195,7 +195,7 @@
       <concept id="1215695201514" name="jetbrains.mps.baseLanguage.structure.MinusAssignmentExpression" flags="nn" index="d5anL" />
       <concept id="1153422105332" name="jetbrains.mps.baseLanguage.structure.RemExpression" flags="nn" index="2dk9JS" />
       <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
-      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ng" index="2frcj7">
+      <concept id="2323553266850475941" name="jetbrains.mps.baseLanguage.structure.IHasModifiers" flags="ngI" index="2frcj7">
         <child id="2323553266850475953" name="modifiers" index="2frcjj" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
@@ -231,7 +231,7 @@
         <reference id="1188208074048" name="annotation" index="2AI5Lk" />
         <child id="1188214630783" name="value" index="2B76xF" />
       </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
+      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
         <child id="1188208488637" name="annotation" index="2AJF6D" />
       </concept>
       <concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
@@ -319,7 +319,7 @@
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
       </concept>
-      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ng" index="366HgL">
+      <concept id="1513279640923991009" name="jetbrains.mps.baseLanguage.structure.IGenericClassCreator" flags="ngI" index="366HgL">
         <property id="1513279640906337053" name="inferTypeParams" index="373rjd" />
       </concept>
       <concept id="1109279763828" name="jetbrains.mps.baseLanguage.structure.TypeVariableDeclaration" flags="ng" index="16euLQ">
@@ -409,7 +409,7 @@
         <child id="1154542793668" name="componentType" index="3g7fb8" />
         <child id="1154542803372" name="initValue" index="3g7hyw" />
       </concept>
-      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ngI" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
         <child id="4972241301747169160" name="typeArgument" index="3PaCim" />
@@ -455,7 +455,7 @@
       <concept id="1184952934362" name="jetbrains.mps.baseLanguage.structure.DimensionExpression" flags="nn" index="3$GHV9">
         <child id="1184953288404" name="expression" index="3$I4v7" />
       </concept>
-      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
@@ -574,7 +574,7 @@
       <concept id="2068944020170241612" name="jetbrains.mps.baseLanguage.javadoc.structure.ClassifierDocComment" flags="ng" index="3UR2Jj" />
     </language>
     <language id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers">
-      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ng" index="2WEnae">
+      <concept id="1205756064662" name="jetbrains.mps.baseLanguage.classifiers.structure.IMemberOperation" flags="ngI" index="2WEnae">
         <reference id="1205756909548" name="member" index="2WH_rO" />
       </concept>
       <concept id="1205769149993" name="jetbrains.mps.baseLanguage.classifiers.structure.DefaultClassifierMethodCallOperation" flags="nn" index="2XshWL">
@@ -647,7 +647,7 @@
         <property id="1193676396447" name="virtualPackage" index="3GE5qa" />
         <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
       </concept>
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
       <concept id="4222318806802425298" name="jetbrains.mps.lang.core.structure.SuppressErrorsAnnotation" flags="ng" index="15s5l7">
@@ -731,7 +731,6 @@
       <concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
         <child id="1201654602639" name="key" index="38cxEo" />
       </concept>
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
@@ -30719,14 +30718,14 @@
                         <ref role="3cqZAo" node="74e51JiAe1W" resolve="style" />
                       </node>
                       <node concept="37vLTw" id="74e51JiCXU1" role="37wK5m">
-                        <ref role="3cqZAo" node="74e51JiCl9O" resolve="it" />
+                        <ref role="3cqZAo" node="4Jof1$wE9vI" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="74e51JiCl9O" role="1bW2Oz">
+                <node concept="gl6BB" id="4Jof1$wE9vI" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="74e51JiCl9P" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4Jof1$wE9vJ" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -89633,14 +89632,14 @@
                         <ref role="3cqZAo" node="6HawCQIg08k" resolve="style" />
                       </node>
                       <node concept="37vLTw" id="74e51JiiKSA" role="37wK5m">
-                        <ref role="3cqZAo" node="74e51JiizxG" resolve="it" />
+                        <ref role="3cqZAo" node="4Jof1$wE9vK" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="74e51JiizxG" role="1bW2Oz">
+                <node concept="gl6BB" id="4Jof1$wE9vK" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="74e51JiizxH" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4Jof1$wE9vL" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -89780,14 +89779,14 @@
                     <node concept="1rXfSq" id="74e51JiiV9K" role="3clFbG">
                       <ref role="37wK5l" node="74e51JihK0s" resolve="resetButtonVisibility" />
                       <node concept="37vLTw" id="74e51JiiV9M" role="37wK5m">
-                        <ref role="3cqZAo" node="74e51JiiV9N" resolve="it" />
+                        <ref role="3cqZAo" node="4Jof1$wE9vM" resolve="it" />
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="74e51JiiV9N" role="1bW2Oz">
+                <node concept="gl6BB" id="4Jof1$wE9vM" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="74e51JiiV9O" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4Jof1$wE9vN" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -90231,7 +90230,7 @@
                       <node concept="2OqwBi" id="5SSrxUjn9in" role="3clFbG">
                         <node concept="2OqwBi" id="5SSrxUjn6qU" role="2Oq$k0">
                           <node concept="37vLTw" id="5SSrxUjn4QF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5SSrxUjmDOL" resolve="it" />
+                            <ref role="3cqZAo" node="4Jof1$wE9vO" resolve="it" />
                           </node>
                           <node concept="liA8E" id="5SSrxUjn87G" role="2OqNvi">
                             <ref role="37wK5l" to="nkm5:27djZ8A0aKg" resolve="getModel" />
@@ -90240,15 +90239,15 @@
                         <node concept="liA8E" id="5SSrxUjnb8b" role="2OqNvi">
                           <ref role="37wK5l" to="nkm5:74e51Jj37qu" resolve="hasInvisibleEdges" />
                           <node concept="37vLTw" id="5SSrxUjndOw" role="37wK5m">
-                            <ref role="3cqZAo" node="5SSrxUjmDOL" resolve="it" />
+                            <ref role="3cqZAo" node="4Jof1$wE9vO" resolve="it" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="Rh6nW" id="5SSrxUjmDOL" role="1bW2Oz">
+                  <node concept="gl6BB" id="4Jof1$wE9vO" role="1bW2Oz">
                     <property role="TrG5h" value="it" />
-                    <node concept="2jxLKc" id="5SSrxUjmDOM" role="1tU5fm" />
+                    <node concept="2jxLKc" id="4Jof1$wE9vP" role="1tU5fm" />
                   </node>
                 </node>
               </node>
@@ -144403,7 +144402,7 @@
                                   <ref role="37wK5l" to="nkm5:2JYLxR6CE9S" resolve="getBox" />
                                   <node concept="2OqwBi" id="6OfpnAg2DoA" role="37wK5m">
                                     <node concept="37vLTw" id="6OfpnAg2DoB" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6OfpnAg2DoK" resolve="it" />
+                                      <ref role="3cqZAo" node="4Jof1$wE9vQ" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="6OfpnAg2DoC" role="2OqNvi">
                                       <ref role="37wK5l" to="nkm5:4nlFaMefDTQ" resolve="getResolvedEndpointFrom" />
@@ -144420,7 +144419,7 @@
                                   <ref role="1Pybhc" to="nkm5:2JYLxR6CE8o" resolve="EndpointUtil" />
                                   <node concept="2OqwBi" id="6OfpnAg2DoG" role="37wK5m">
                                     <node concept="37vLTw" id="6OfpnAg2DoH" role="2Oq$k0">
-                                      <ref role="3cqZAo" node="6OfpnAg2DoK" resolve="it" />
+                                      <ref role="3cqZAo" node="4Jof1$wE9vQ" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="6OfpnAg2DoI" role="2OqNvi">
                                       <ref role="37wK5l" to="nkm5:4nlFaMefzhX" resolve="getResolvedEndpointTo" />
@@ -144434,9 +144433,9 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="Rh6nW" id="6OfpnAg2DoK" role="1bW2Oz">
+                        <node concept="gl6BB" id="4Jof1$wE9vQ" role="1bW2Oz">
                           <property role="TrG5h" value="it" />
-                          <node concept="2jxLKc" id="6OfpnAg2DoL" role="1tU5fm" />
+                          <node concept="2jxLKc" id="4Jof1$wE9vR" role="1tU5fm" />
                         </node>
                       </node>
                     </node>
@@ -144467,7 +144466,7 @@
                   <node concept="3clFbF" id="6OfpnAg2DoX" role="3cqZAp">
                     <node concept="2OqwBi" id="6OfpnAg2DoY" role="3clFbG">
                       <node concept="37vLTw" id="6OfpnAg2DoZ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="6OfpnAg2Dp2" resolve="it" />
+                        <ref role="3cqZAo" node="4Jof1$wE9vS" resolve="it" />
                       </node>
                       <node concept="liA8E" id="6OfpnAg2Dp0" role="2OqNvi">
                         <ref role="37wK5l" to="nkm5:YGA9S7knRn" resolve="setVisible" />
@@ -144478,9 +144477,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6OfpnAg2Dp2" role="1bW2Oz">
+                <node concept="gl6BB" id="4Jof1$wE9vS" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6OfpnAg2Dp3" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4Jof1$wE9vT" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -145584,7 +145583,7 @@
                       </node>
                       <node concept="2OqwBi" id="6OfpnAg6N9j" role="33vP2m">
                         <node concept="37vLTw" id="6OfpnAg6N9k" role="2Oq$k0">
-                          <ref role="3cqZAo" node="6OfpnAg6N9K" resolve="it" />
+                          <ref role="3cqZAo" node="4Jof1$wE9vU" resolve="it" />
                         </node>
                         <node concept="liA8E" id="6OfpnAg6N9l" role="2OqNvi">
                           <ref role="37wK5l" to="nkm5:190K99K25OU" resolve="getBounds" />
@@ -145659,9 +145658,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6OfpnAg6N9K" role="1bW2Oz">
+                <node concept="gl6BB" id="4Jof1$wE9vU" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6OfpnAg6N9L" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4Jof1$wE9vV" role="1tU5fm" />
                 </node>
               </node>
             </node>
@@ -145746,7 +145745,7 @@
                           <node concept="1eOMI4" id="6OfpnAg6Nar" role="33vP2m">
                             <node concept="10QFUN" id="6OfpnAg6Nas" role="1eOMHV">
                               <node concept="37vLTw" id="6OfpnAg6Nat" role="10QFUP">
-                                <ref role="3cqZAo" node="6OfpnAg6NcS" resolve="it" />
+                                <ref role="3cqZAo" node="4Jof1$wE9vW" resolve="it" />
                               </node>
                               <node concept="3uibUv" id="6OfpnAg6Nau" role="10QFUM">
                                 <ref role="3uigEE" to="nkm5:7oq1PhONPCf" resolve="BoxBase" />
@@ -145834,7 +145833,7 @@
                         <ref role="3uigEE" to="nkm5:7oq1PhONPCf" resolve="BoxBase" />
                       </node>
                       <node concept="37vLTw" id="6OfpnAg6NaX" role="2ZW6bz">
-                        <ref role="3cqZAo" node="6OfpnAg6NcS" resolve="it" />
+                        <ref role="3cqZAo" node="4Jof1$wE9vW" resolve="it" />
                       </node>
                     </node>
                     <node concept="3eNFk2" id="6OfpnAg6NaY" role="3eNLev">
@@ -145851,7 +145850,7 @@
                                   <ref role="3uigEE" to="nkm5:27djZ8_YaVo" resolve="Edge" />
                                 </node>
                                 <node concept="37vLTw" id="6OfpnAg6Nb6" role="10QFUP">
-                                  <ref role="3cqZAo" node="6OfpnAg6NcS" resolve="it" />
+                                  <ref role="3cqZAo" node="4Jof1$wE9vW" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -146040,7 +146039,7 @@
                           <ref role="3uigEE" to="nkm5:27djZ8_YaVo" resolve="Edge" />
                         </node>
                         <node concept="37vLTw" id="6OfpnAg6Ncf" role="2ZW6bz">
-                          <ref role="3cqZAo" node="6OfpnAg6NcS" resolve="it" />
+                          <ref role="3cqZAo" node="4Jof1$wE9vW" resolve="it" />
                         </node>
                       </node>
                     </node>
@@ -146050,7 +146049,7 @@
                           <ref role="3uigEE" to="nkm5:7oq1PhOMzhH" resolve="Annotation" />
                         </node>
                         <node concept="37vLTw" id="6OfpnAg6Ncj" role="2ZW6bz">
-                          <ref role="3cqZAo" node="6OfpnAg6NcS" resolve="it" />
+                          <ref role="3cqZAo" node="4Jof1$wE9vW" resolve="it" />
                         </node>
                       </node>
                       <node concept="3clFbS" id="6OfpnAg6Nck" role="3eOfB_">
@@ -146066,7 +146065,7 @@
                                   <ref role="3uigEE" to="nkm5:7oq1PhOMzhH" resolve="Annotation" />
                                 </node>
                                 <node concept="37vLTw" id="6OfpnAg6Ncr" role="10QFUP">
-                                  <ref role="3cqZAo" node="6OfpnAg6NcS" resolve="it" />
+                                  <ref role="3cqZAo" node="4Jof1$wE9vW" resolve="it" />
                                 </node>
                               </node>
                             </node>
@@ -146149,9 +146148,9 @@
                     </node>
                   </node>
                 </node>
-                <node concept="Rh6nW" id="6OfpnAg6NcS" role="1bW2Oz">
+                <node concept="gl6BB" id="4Jof1$wE9vW" role="1bW2Oz">
                   <property role="TrG5h" value="it" />
-                  <node concept="2jxLKc" id="6OfpnAg6NcT" role="1tU5fm" />
+                  <node concept="2jxLKc" id="4Jof1$wE9vX" role="1tU5fm" />
                 </node>
               </node>
             </node>
diff --git a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps
index 08ea98457..ede73f438 100644
--- a/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps
+++ b/code/diagram/solutions/test.de.itemis.mps.editor.diagram.solution/models/test/de/itemis/mps/editor/diagram/solution@tests.mps
@@ -7,7 +7,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
     <use id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout" version="-1" />
     <use id="5a82b7b8-2303-45be-b960-4e3ff16e82ce" name="de.itemis.mps.editor.diagram.demo.activity" version="-1" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="-1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
@@ -317,6 +317,7 @@
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
       </concept>
@@ -758,7 +759,6 @@
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227022179634" name="jetbrains.mps.baseLanguage.collections.structure.AddLastElementOperation" flags="nn" index="2Ke9KJ" />
-      <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -3761,7 +3761,7 @@
                                         </node>
                                         <node concept="2OqwBi" id="l6SLw4jJDX" role="3uHU7B">
                                           <node concept="37vLTw" id="l6SLw4jJDY" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="l6SLw4jJE0" resolve="it" />
+                                            <ref role="3cqZAo" node="4Jof1$wE_Hg" resolve="it" />
                                           </node>
                                           <node concept="liA8E" id="l6SLw4jJDZ" role="2OqNvi">
                                             <ref role="37wK5l" to="nkm5:KILMQGrGW$" resolve="getText" />
@@ -3770,9 +3770,9 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="Rh6nW" id="l6SLw4jJE0" role="1bW2Oz">
+                                  <node concept="gl6BB" id="4Jof1$wE_Hg" role="1bW2Oz">
                                     <property role="TrG5h" value="it" />
-                                    <node concept="2jxLKc" id="l6SLw4jJE1" role="1tU5fm" />
+                                    <node concept="2jxLKc" id="4Jof1$wE_Hh" role="1tU5fm" />
                                   </node>
                                 </node>
                               </node>
@@ -22111,7 +22111,7 @@
                 <node concept="3clFbF" id="1mqidcy95ns" role="3cqZAp">
                   <node concept="2OqwBi" id="1mqidcy9698" role="3clFbG">
                     <node concept="37vLTw" id="1mqidcy95nr" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1mqidcy95gP" resolve="it" />
+                      <ref role="3cqZAo" node="4Jof1$wE_Hi" resolve="it" />
                     </node>
                     <node concept="liA8E" id="1mqidcy975V" role="2OqNvi">
                       <ref role="37wK5l" to="r3rm:YGA9S7lEL4" resolve="isVisible" />
@@ -22119,9 +22119,9 @@
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="1mqidcy95gP" role="1bW2Oz">
+              <node concept="gl6BB" id="4Jof1$wE_Hi" role="1bW2Oz">
                 <property role="TrG5h" value="it" />
-                <node concept="2jxLKc" id="1mqidcy95gQ" role="1tU5fm" />
+                <node concept="2jxLKc" id="4Jof1$wE_Hj" role="1tU5fm" />
               </node>
             </node>
           </node>
@@ -22172,7 +22172,7 @@
                           <node concept="3fqX7Q" id="1mqidcy9aMc" role="3clFbG">
                             <node concept="2OqwBi" id="1mqidcy9aMe" role="3fr31v">
                               <node concept="37vLTw" id="1mqidcy9aMf" role="2Oq$k0">
-                                <ref role="3cqZAo" node="1mqidcy99Fj" resolve="it" />
+                                <ref role="3cqZAo" node="4Jof1$wE_Hk" resolve="it" />
                               </node>
                               <node concept="liA8E" id="1mqidcy9aMg" role="2OqNvi">
                                 <ref role="37wK5l" to="r3rm:YGA9S7lEL4" resolve="isVisible" />
@@ -22181,9 +22181,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1mqidcy99Fj" role="1bW2Oz">
+                      <node concept="gl6BB" id="4Jof1$wE_Hk" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1mqidcy99Fk" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4Jof1$wE_Hl" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
@@ -22233,7 +22233,7 @@
                         <node concept="3clFbF" id="1mqidcy9bUQ" role="3cqZAp">
                           <node concept="2OqwBi" id="1mqidcy9bUR" role="3clFbG">
                             <node concept="37vLTw" id="1mqidcy9bUS" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1mqidcy9bUU" resolve="it" />
+                              <ref role="3cqZAo" node="4Jof1$wE_Hm" resolve="it" />
                             </node>
                             <node concept="liA8E" id="1mqidcy9bUT" role="2OqNvi">
                               <ref role="37wK5l" to="r3rm:YGA9S7lEL4" resolve="isVisible" />
@@ -22241,9 +22241,9 @@
                           </node>
                         </node>
                       </node>
-                      <node concept="Rh6nW" id="1mqidcy9bUU" role="1bW2Oz">
+                      <node concept="gl6BB" id="4Jof1$wE_Hm" role="1bW2Oz">
                         <property role="TrG5h" value="it" />
-                        <node concept="2jxLKc" id="1mqidcy9bUV" role="1tU5fm" />
+                        <node concept="2jxLKc" id="4Jof1$wE_Hn" role="1tU5fm" />
                       </node>
                     </node>
                   </node>
diff --git a/code/multiline/languages/multiline/languageModels/structure.mps b/code/multiline/languages/multiline/languageModels/structure.mps
index 1e09bc8bc..354c0141d 100644
--- a/code/multiline/languages/multiline/languageModels/structure.mps
+++ b/code/multiline/languages/multiline/languageModels/structure.mps
@@ -5,7 +5,7 @@
   <languages>
     <use id="982eb8df-2c96-4bd7-9963-11712ea622e5" name="jetbrains.mps.lang.resources" version="2" />
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
-    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
     <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="5" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
@@ -39,7 +39,7 @@
       </concept>
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>