diff --git a/.mps/migration.xml b/.mps/migration.xml
index 26e6596a..25045b7d 100644
--- a/.mps/migration.xml
+++ b/.mps/migration.xml
@@ -8,6 +8,8 @@
     <entry key="jetbrains.mps.fixMig_33_331" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v172.JUnitLibsRepackaging" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v191.SaveAllJavaStubMethodRefsToShortForeignFormat" value="executed" />
+    <entry key="jetbrains.mps.ide.mpsmigration.v191.UpdateJavaStubMethodRefs" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v33.UpdateModuleUsedLang" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v34.EngagedLanguagesImports" value="executed" />
     <entry key="jetbrains.mps.ide.mpsmigration.v35.EditorGeneratorRefactoring" value="executed" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index b87cab25..e6a17f1d 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -3,12 +3,12 @@
   <persistence version="9" />
   <languages>
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="-1" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="-1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="-1" />
     <use id="f159adf4-3c93-40f9-9c5a-1f245a8697af" name="jetbrains.mps.lang.aspect" version="2" />
     <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="-1" />
@@ -16,7 +16,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -908,7 +908,7 @@
                   <ref role="3cqZAo" node="36tQV5A_uY9" resolve="trackMap" />
                 </node>
                 <node concept="liA8E" id="36tQV5A_uYq" role="2OqNvi">
-                  <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.putIfAbsent(java.lang.Object,java.lang.Object):java.lang.Object" resolve="putIfAbsent" />
+                  <ref role="37wK5l" to="5zyv:~ConcurrentHashMap.putIfAbsent(java.lang.Object,java.lang.Object)" resolve="putIfAbsent" />
                   <node concept="2OqwBi" id="36tQV5A_uYr" role="37wK5m">
                     <node concept="30H73N" id="36tQV5A_uYs" role="2Oq$k0" />
                     <node concept="3TrcHB" id="36tQV5A_uYt" role="2OqNvi">
@@ -3759,7 +3759,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="18kNIl1hGyL" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                  <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                   <node concept="2OqwBi" id="18kNIl1hGyM" role="37wK5m">
                     <node concept="2JrnkZ" id="18kNIl1hGyN" role="2Oq$k0">
                       <node concept="2OqwBi" id="18kNIl1hGyO" role="2JrQYb">
@@ -3768,7 +3768,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="18kNIl1hGyR" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                     </node>
                   </node>
                 </node>
@@ -3805,7 +3805,7 @@
                               <property role="Xl_RC" value="generated" />
                             </node>
                             <node concept="liA8E" id="18kNIl1hIia" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                               <node concept="2OqwBi" id="18kNIl1hIib" role="37wK5m">
                                 <node concept="2OqwBi" id="18kNIl1hIic" role="2Oq$k0">
                                   <node concept="37vLTw" id="18kNIl1hIid" role="2Oq$k0">
@@ -4622,7 +4622,7 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="7smgEqgB$P1" role="2OqNvi">
-                                    <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                                   </node>
                                 </node>
                               </node>
@@ -6137,11 +6137,11 @@
                             <node concept="30H73N" id="4MEOIDEhSL0" role="2JrQYb" />
                           </node>
                           <node concept="liA8E" id="4MEOIDEhVEp" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
                           </node>
                         </node>
                         <node concept="liA8E" id="4MEOIDEhWxu" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                         </node>
                       </node>
                     </node>
@@ -6253,11 +6253,11 @@
                 <ref role="1Pybhc" to="psr6:4MEOIDEhyPY" resolve="MacroTemplate.ID" />
                 <node concept="2OqwBi" id="4MEOIDEWUYy" role="37wK5m">
                   <node concept="2YIFZM" id="4MEOIDEWUOF" role="2Oq$k0">
-                    <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
+                    <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance()" resolve="getInstance" />
                     <ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
                   </node>
                   <node concept="liA8E" id="4MEOIDEWV6s" role="2OqNvi">
-                    <ref role="37wK5l" to="dush:~PersistenceFacade.createNodeReference(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="createNodeReference" />
+                    <ref role="37wK5l" to="dush:~PersistenceFacade.createNodeReference(java.lang.String)" resolve="createNodeReference" />
                     <node concept="Xl_RD" id="4MEOIDEWVa7" role="37wK5m">
                       <property role="Xl_RC" value="" />
                       <node concept="17Uvod" id="4MEOIDEWVf0" role="lGtFl">
@@ -6268,17 +6268,17 @@
                             <node concept="3clFbF" id="4MEOIDEWW7p" role="3cqZAp">
                               <node concept="2OqwBi" id="4MEOIDEX0Aw" role="3clFbG">
                                 <node concept="2YIFZM" id="4MEOIDEX0m5" role="2Oq$k0">
-                                  <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
+                                  <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance()" resolve="getInstance" />
                                   <ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
                                 </node>
                                 <node concept="liA8E" id="4MEOIDEX0Pn" role="2OqNvi">
-                                  <ref role="37wK5l" to="dush:~PersistenceFacade.asString(org.jetbrains.mps.openapi.model.SNodeReference):java.lang.String" resolve="asString" />
+                                  <ref role="37wK5l" to="dush:~PersistenceFacade.asString(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="asString" />
                                   <node concept="2OqwBi" id="4MEOIDEWZ8Y" role="37wK5m">
                                     <node concept="2JrnkZ" id="4MEOIDEWYPH" role="2Oq$k0">
                                       <node concept="30H73N" id="4MEOIDEWW7o" role="2JrQYb" />
                                     </node>
                                     <node concept="liA8E" id="4MEOIDEX1Sy" role="2OqNvi">
-                                      <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                      <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                                     </node>
                                   </node>
                                 </node>
@@ -6540,7 +6540,7 @@
                     <node concept="3cpWs3" id="36tQV5AHe9F" role="3clFbG">
                       <node concept="2OqwBi" id="36tQV5AHe9G" role="3uHU7w">
                         <node concept="2YIFZM" id="36tQV5AHe9H" role="2Oq$k0">
-                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                           <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                           <node concept="2OqwBi" id="36tQV5AHe9I" role="37wK5m">
                             <node concept="2JrnkZ" id="36tQV5AHe9J" role="2Oq$k0">
@@ -6606,12 +6606,12 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="36tQV5AHea1" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
                             </node>
                           </node>
                         </node>
                         <node concept="liA8E" id="36tQV5AHea2" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String):java.lang.String" resolve="replaceAll" />
+                          <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
                           <node concept="Xl_RD" id="36tQV5AHea3" role="37wK5m">
                             <property role="Xl_RC" value="~" />
                           </node>
@@ -6827,7 +6827,7 @@
                           </node>
                           <node concept="2YIFZM" id="36tQV5AHrgC" role="3uHU7w">
                             <ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
-                            <ref role="37wK5l" to="18ew:~NameUtil.escapeString(java.lang.String):java.lang.String" resolve="escapeString" />
+                            <ref role="37wK5l" to="18ew:~NameUtil.escapeString(java.lang.String)" resolve="escapeString" />
                             <node concept="2OqwBi" id="36tQV5AHrgD" role="37wK5m">
                               <node concept="2JrnkZ" id="36tQV5AHrgE" role="2Oq$k0">
                                 <node concept="2OqwBi" id="36tQV5AHs61" role="2JrQYb">
@@ -6892,7 +6892,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="36tQV5AHrgW" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SNode.getName():java.lang.String" resolve="getName" />
+                                <ref role="37wK5l" to="mhbf:~SNode.getName()" resolve="getName" />
                               </node>
                             </node>
                           </node>
@@ -6904,7 +6904,7 @@
                       <node concept="2OqwBi" id="36tQV5AHrgY" role="3uHU7w">
                         <node concept="2YIFZM" id="36tQV5AHrgZ" role="2Oq$k0">
                           <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                           <node concept="2OqwBi" id="36tQV5AHrh0" role="37wK5m">
                             <node concept="2JrnkZ" id="36tQV5AHrh1" role="2Oq$k0">
                               <node concept="2OqwBi" id="7lt0LtPM62Z" role="2JrQYb">
@@ -6969,12 +6969,12 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="36tQV5AHrhj" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
                             </node>
                           </node>
                         </node>
                         <node concept="liA8E" id="36tQV5AHrhk" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String):java.lang.String" resolve="replaceAll" />
+                          <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
                           <node concept="Xl_RD" id="36tQV5AHrhl" role="37wK5m">
                             <property role="Xl_RC" value="~" />
                           </node>
@@ -7590,7 +7590,7 @@
           <node concept="3clFbF" id="7HUwyZaPVcS" role="3cqZAp">
             <node concept="2OqwBi" id="7HUwyZaPVgJ" role="3clFbG">
               <node concept="liA8E" id="7HUwyZaPVif" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
+                <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int)" resolve="logicalAt" />
                 <node concept="3cmrfG" id="7HUwyZaPVje" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                   <node concept="29HgVG" id="7HUwyZaPVjf" role="lGtFl">
@@ -8523,7 +8523,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="7HUwyZaWNV2" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
+                    <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int)" resolve="logicalAt" />
                     <node concept="3cmrfG" id="452KZTbxZd8" role="37wK5m">
                       <property role="3cmrfH" value="1" />
                       <node concept="29HgVG" id="452KZTbxZd9" role="lGtFl">
@@ -11552,11 +11552,11 @@
                         <ref role="1Pybhc" to="psr6:4MEOIDEhyPY" resolve="MacroTemplate.ID" />
                         <node concept="2OqwBi" id="7kTeLbPzWAn" role="37wK5m">
                           <node concept="2YIFZM" id="7kTeLbPzWAo" role="2Oq$k0">
-                            <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
+                            <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance()" resolve="getInstance" />
                             <ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
                           </node>
                           <node concept="liA8E" id="7kTeLbPzWAp" role="2OqNvi">
-                            <ref role="37wK5l" to="dush:~PersistenceFacade.createNodeReference(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="createNodeReference" />
+                            <ref role="37wK5l" to="dush:~PersistenceFacade.createNodeReference(java.lang.String)" resolve="createNodeReference" />
                             <node concept="Xl_RD" id="7kTeLbPzWAq" role="37wK5m">
                               <property role="Xl_RC" value="" />
                               <node concept="17Uvod" id="7kTeLbPzWAr" role="lGtFl">
@@ -11568,10 +11568,10 @@
                                       <node concept="2OqwBi" id="7kTeLbPzWAv" role="3clFbG">
                                         <node concept="2YIFZM" id="7kTeLbPzWAw" role="2Oq$k0">
                                           <ref role="1Pybhc" to="dush:~PersistenceFacade" resolve="PersistenceFacade" />
-                                          <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance():org.jetbrains.mps.openapi.persistence.PersistenceFacade" resolve="getInstance" />
+                                          <ref role="37wK5l" to="dush:~PersistenceFacade.getInstance()" resolve="getInstance" />
                                         </node>
                                         <node concept="liA8E" id="7kTeLbPzWAx" role="2OqNvi">
-                                          <ref role="37wK5l" to="dush:~PersistenceFacade.asString(org.jetbrains.mps.openapi.model.SNodeReference):java.lang.String" resolve="asString" />
+                                          <ref role="37wK5l" to="dush:~PersistenceFacade.asString(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="asString" />
                                           <node concept="2OqwBi" id="7kTeLbPzWAy" role="37wK5m">
                                             <node concept="2JrnkZ" id="7kTeLbPzWAz" role="2Oq$k0">
                                               <node concept="2OqwBi" id="7kTeLbPzWA$" role="2JrQYb">
@@ -11582,7 +11582,7 @@
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="7kTeLbPzWAB" role="2OqNvi">
-                                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                                             </node>
                                           </node>
                                         </node>
@@ -13199,7 +13199,7 @@
             </node>
           </node>
           <node concept="2YIFZM" id="36tQV5AoEXV" role="37wK5m">
-            <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="deserialize" />
+            <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
             <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
             <node concept="Xl_RD" id="36tQV5AoEXW" role="37wK5m">
               <property role="Xl_RC" value="" />
@@ -13220,11 +13220,11 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="36tQV5AoEY8" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                           </node>
                         </node>
                         <node concept="liA8E" id="36tQV5AoEY9" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                         </node>
                       </node>
                     </node>
@@ -14262,7 +14262,7 @@
                       </node>
                       <node concept="2OqwBi" id="1FOQehwQzuX" role="37wK5m">
                         <node concept="liA8E" id="1FOQehwQzWd" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                          <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                         </node>
                         <node concept="2JrnkZ" id="1FOQehwQzv2" role="2Oq$k0">
                           <node concept="37vLTw" id="1FOQehwQy9N" role="2JrQYb">
@@ -14379,7 +14379,7 @@
                     </node>
                     <node concept="2OqwBi" id="1FOQehwQB0Z" role="37wK5m">
                       <node concept="liA8E" id="1FOQehwQB10" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                        <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                       </node>
                       <node concept="2JrnkZ" id="1FOQehwQB11" role="2Oq$k0">
                         <node concept="37vLTw" id="1FOQehwQB12" role="2JrQYb">
@@ -14699,7 +14699,7 @@
             </node>
             <node concept="2YIFZM" id="6tPOoeT3TgF" role="37vLTx">
               <ref role="1Pybhc" to="w1kc:~SNodePointer" resolve="SNodePointer" />
-              <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String):org.jetbrains.mps.openapi.model.SNodeReference" resolve="deserialize" />
+              <ref role="37wK5l" to="w1kc:~SNodePointer.deserialize(java.lang.String)" resolve="deserialize" />
               <node concept="Xl_RD" id="6tPOoeT3TgG" role="37wK5m">
                 <property role="Xl_RC" value="" />
                 <node concept="17Uvod" id="6tPOoeT3TgH" role="lGtFl">
@@ -14719,11 +14719,11 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="6tPOoeT3TgS" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                             </node>
                           </node>
                           <node concept="liA8E" id="6tPOoeT3TgT" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                           </node>
                         </node>
                       </node>
@@ -15526,7 +15526,7 @@
             <node concept="3cpWs3" id="NKt6yobexy" role="3clFbG">
               <node concept="3zGtF$" id="NKt6yobeK7" role="3uHU7w" />
               <node concept="2YIFZM" id="NKt6yobdr_" role="3uHU7B">
-                <ref role="37wK5l" to="18ew:~NameUtil.capitalize(java.lang.String):java.lang.String" resolve="capitalize" />
+                <ref role="37wK5l" to="18ew:~NameUtil.capitalize(java.lang.String)" resolve="capitalize" />
                 <ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
                 <node concept="2OqwBi" id="NKt6yoeFjY" role="37wK5m">
                   <node concept="2OqwBi" id="NKt6yoeDy6" role="2Oq$k0">
@@ -15537,11 +15537,11 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="NKt6yoeEWw" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModel.getName():org.jetbrains.mps.openapi.model.SModelName" resolve="getName" />
+                      <ref role="37wK5l" to="mhbf:~SModel.getName()" resolve="getName" />
                     </node>
                   </node>
                   <node concept="liA8E" id="NKt6yoeFUu" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModelName.getSimpleName():java.lang.String" resolve="getSimpleName" />
+                    <ref role="37wK5l" to="mhbf:~SModelName.getSimpleName()" resolve="getSimpleName" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
index cf3e2654..c32e1ea9 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
+++ b/coderules/languages/jetbrains.mps.lang.coderules/jetbrains.mps.lang.coderules.mpl
@@ -37,12 +37,12 @@
         <language slang="l:f159adf4-3c93-40f9-9c5a-1f245a8697af:jetbrains.mps.lang.aspect" version="2" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
         <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
@@ -122,18 +122,18 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
index 6d19af36..f0537249 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/constraints.mps
@@ -268,7 +268,7 @@
                     <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                     <ref role="37wK5l" to="o8zo:4IP40Bi3e_T" resolve="ListScope" />
                     <node concept="2YIFZM" id="36tQV5AKxYp" role="37wK5m">
-                      <ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object):java.util.List" resolve="singletonList" />
+                      <ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object)" resolve="singletonList" />
                       <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                       <node concept="2OqwBi" id="36tQV5AKxYq" role="37wK5m">
                         <node concept="2OqwBi" id="36tQV5AKxYr" role="2Oq$k0">
@@ -585,7 +585,7 @@
                   <ref role="1Y3XeK" to="o8zo:4IP40Bi3e_R" resolve="ListScope" />
                   <node concept="2YIFZM" id="6DOfTm$zRH3" role="37wK5m">
                     <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-                    <ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object):java.util.List" resolve="singletonList" />
+                    <ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object)" resolve="singletonList" />
                     <node concept="2OqwBi" id="6DOfTm$zUuH" role="37wK5m">
                       <node concept="37vLTw" id="6DOfTm$zRH6" role="2Oq$k0">
                         <ref role="3cqZAo" node="6DOfTm$zRGR" resolve="macroDecl" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
index d5701f21..4b8d462e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/intentions.mps
@@ -9,7 +9,7 @@
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure" version="7" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
index 4540f10b..dc8fb26d 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/structure.mps
@@ -2,7 +2,7 @@
 <model ref="r:83137295-aa87-45e8-b0c0-ede2adf2a396(jetbrains.mps.lang.coderules.structure)">
   <persistence version="9" />
   <languages>
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="78434eb8-b0e5-444b-850d-e7c4ad2da9ab(jetbrains.mps.devkit.aspect.structure)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
index d030a0f5..58a27d5e 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/typesystem.mps
@@ -389,7 +389,7 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="4cvvxaYhDrT" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                          <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                         </node>
                       </node>
                       <node concept="2tJFMh" id="4cvvxaYhE4e" role="3uHU7w">
@@ -533,7 +533,7 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="4cvvxaYh_7T" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                                 </node>
                               </node>
                               <node concept="2tJFMh" id="4cvvxaYhA_C" role="3uHU7w">
@@ -698,11 +698,11 @@
                         <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                       </node>
                       <node concept="liA8E" id="1zN1RIlskpt" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Enum.name():java.lang.String" resolve="name" />
+                        <ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
                       </node>
                     </node>
                     <node concept="liA8E" id="1zN1RIlsm1c" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                      <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                       <node concept="2OqwBi" id="1zN1RIlsmbm" role="37wK5m">
                         <node concept="37vLTw" id="1zN1RIlsm31" role="2Oq$k0">
                           <ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
@@ -758,11 +758,11 @@
                           <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                         </node>
                         <node concept="liA8E" id="1zN1RIlsnkv" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Enum.name():java.lang.String" resolve="name" />
+                          <ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
                         </node>
                       </node>
                       <node concept="liA8E" id="1zN1RIlsnkw" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                         <node concept="2OqwBi" id="1zN1RIlsnkx" role="37wK5m">
                           <node concept="37vLTw" id="1zN1RIlsnky" role="2Oq$k0">
                             <ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
@@ -802,11 +802,11 @@
                           <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                         </node>
                         <node concept="liA8E" id="1zN1RIlsntH" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Enum.name():java.lang.String" resolve="name" />
+                          <ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
                         </node>
                       </node>
                       <node concept="liA8E" id="1zN1RIlsntI" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                         <node concept="2OqwBi" id="1zN1RIlsntJ" role="37wK5m">
                           <node concept="37vLTw" id="1zN1RIlsntK" role="2Oq$k0">
                             <ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
@@ -846,11 +846,11 @@
                           <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
                         </node>
                         <node concept="liA8E" id="1zN1RIlsnBj" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Enum.name():java.lang.String" resolve="name" />
+                          <ref role="37wK5l" to="wyt6:~Enum.name()" resolve="name" />
                         </node>
                       </node>
                       <node concept="liA8E" id="1zN1RIlsnBk" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                         <node concept="2OqwBi" id="1zN1RIlsnBl" role="37wK5m">
                           <node concept="37vLTw" id="1zN1RIlsnBm" role="2Oq$k0">
                             <ref role="3cqZAo" node="1zN1RIls0zx" resolve="methKind" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
index a0c2ba1d..152cd4d0 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/languageModels/util.mps
@@ -6,7 +6,7 @@
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="0" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -256,7 +256,7 @@
                           <property role="Xl_RC" value="kind" />
                         </node>
                         <node concept="liA8E" id="18kNIl1dMWQ" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                           <node concept="2OqwBi" id="18kNIl1dMWR" role="37wK5m">
                             <node concept="37vLTw" id="18kNIl1dMWS" role="2Oq$k0">
                               <ref role="3cqZAo" node="18kNIl1dMWU" resolve="it" />
@@ -490,7 +490,7 @@
                           <property role="Xl_RC" value="generated" />
                         </node>
                         <node concept="liA8E" id="18kNIl1dUkI" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                           <node concept="2OqwBi" id="18kNIl1dUkJ" role="37wK5m">
                             <node concept="37vLTw" id="18kNIl1dUkK" role="2Oq$k0">
                               <ref role="3cqZAo" node="18kNIl1dUkM" resolve="it" />
@@ -606,11 +606,11 @@
             <node concept="3cpWs6" id="18kNIl1e6DC" role="3cqZAp">
               <node concept="1Wc70l" id="18kNIl1eaG8" role="3cqZAk">
                 <node concept="2YIFZM" id="18kNIl1edvc" role="3uHU7w">
-                  <ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String):java.lang.Boolean" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String)" resolve="valueOf" />
                   <ref role="1Pybhc" to="wyt6:~Boolean" resolve="Boolean" />
                   <node concept="2YIFZM" id="18kNIl1ejJ5" role="37wK5m">
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(boolean):java.lang.String" resolve="valueOf" />
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(boolean)" resolve="valueOf" />
                     <node concept="2OqwBi" id="18kNIl1h0L1" role="37wK5m">
                       <node concept="1PxgMI" id="18kNIl1gZvI" role="2Oq$k0">
                         <property role="1BlNFB" value="true" />
@@ -681,7 +681,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="18kNIl1dQP9" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                 <node concept="2OqwBi" id="18kNIl1dQPa" role="37wK5m">
                   <node concept="2JrnkZ" id="18kNIl1dQPb" role="2Oq$k0">
                     <node concept="2OqwBi" id="18kNIl1dQPc" role="2JrQYb">
@@ -692,7 +692,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="18kNIl1dQPf" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
               </node>
@@ -707,7 +707,7 @@
                   <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
                   <node concept="2YIFZM" id="18kNIl1dQPl" role="37wK5m">
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                     <node concept="Xl_RD" id="18kNIl1dQPm" role="37wK5m">
                       <property role="Xl_RC" value="could not resolve %s" />
                     </node>
@@ -720,7 +720,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="18kNIl1dQPp" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
                       </node>
                     </node>
                   </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
index e60d8156..c96a0272 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/jetbrains.mps.lang.coderules.runtime.msd
@@ -25,7 +25,7 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
index 53065d58..efcf2759 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.eval.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
@@ -700,7 +700,7 @@
                   <ref role="3cqZAo" node="70Wv0dJjilw" resolve="originIdxRef" />
                 </node>
                 <node concept="liA8E" id="70Wv0dJjkzh" role="2OqNvi">
-                  <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
+                  <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
                   <node concept="2OqwBi" id="70Wv0dJjkzH" role="37wK5m">
                     <node concept="37vLTw" id="70Wv0dJjkzI" role="2Oq$k0">
                       <ref role="3cqZAo" node="70Wv0dJhOMB" resolve="pex" />
@@ -730,7 +730,7 @@
               <ref role="3uigEE" to="w7la:~EvaluationSession$Config" resolve="EvaluationSession.Config" />
             </node>
             <node concept="2YIFZM" id="7WKNeR9xpPQ" role="33vP2m">
-              <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="newSession" />
+              <ref role="37wK5l" to="w7la:~EvaluationSession.newSession(jetbrains.mps.logic.reactor.program.Program)" resolve="newSession" />
               <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
               <node concept="37vLTw" id="7WKNeR9xpPR" role="37wK5m">
                 <ref role="3cqZAo" node="7lt0LtQtD2v" resolve="program" />
@@ -892,7 +892,7 @@
                 <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
               </node>
               <node concept="liA8E" id="3GlpCDSD3d3" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withTrace(jetbrains.mps.logic.reactor.evaluation.EvaluationTrace):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withTrace" />
+                <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withTrace(jetbrains.mps.logic.reactor.evaluation.EvaluationTrace)" resolve="withTrace" />
                 <node concept="37vLTw" id="3GlpCDSD3d4" role="37wK5m">
                   <ref role="3cqZAo" node="24Vro6cQKgF" resolve="tracer" />
                 </node>
@@ -910,7 +910,7 @@
                     <ref role="3cqZAo" node="7WKNeR9xpPP" resolve="config" />
                   </node>
                   <node concept="liA8E" id="5cnt3vh3FQa" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withStoreView(jetbrains.mps.logic.reactor.evaluation.StoreView):jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Config" resolve="withStoreView" />
+                    <ref role="37wK5l" to="w7la:~EvaluationSession$Config.withStoreView(jetbrains.mps.logic.reactor.evaluation.StoreView)" resolve="withStoreView" />
                     <node concept="37vLTw" id="5cnt3vh3FTs" role="37wK5m">
                       <ref role="3cqZAo" node="5cnt3vh3s4F" resolve="storeView" />
                     </node>
@@ -949,7 +949,7 @@
                   <ref role="3cqZAo" node="5cnt3vh3s4F" resolve="storeView" />
                 </node>
                 <node concept="liA8E" id="5cnt3vheYOW" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~StoreView.allOccurrences():java.lang.Iterable" resolve="allOccurrences" />
+                  <ref role="37wK5l" to="w7la:~StoreView.allOccurrences()" resolve="allOccurrences" />
                 </node>
               </node>
             </node>
@@ -1685,7 +1685,7 @@
                     <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationResult" />
                   </node>
                   <node concept="liA8E" id="5jCHAT1QTDv" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~EvaluationResult.storeView():jetbrains.mps.logic.reactor.evaluation.StoreView" resolve="storeView" />
+                    <ref role="37wK5l" to="w7la:~EvaluationResult.storeView()" resolve="storeView" />
                   </node>
                 </node>
               </node>
@@ -1713,7 +1713,7 @@
                             <ref role="3cqZAo" node="4F3SXIF5J_f" resolve="e" />
                           </node>
                           <node concept="liA8E" id="4ZcizIatOSH" role="2OqNvi">
-                            <ref role="37wK5l" to="33ny:~Map$Entry.getValue():java.lang.Object" resolve="getValue" />
+                            <ref role="37wK5l" to="33ny:~Map$Entry.getValue()" resolve="getValue" />
                           </node>
                         </node>
                       </node>
@@ -1737,7 +1737,7 @@
                                       <ref role="3cqZAo" node="4F3SXIF5J_f" resolve="e" />
                                     </node>
                                     <node concept="liA8E" id="4F3SXIF5J$V" role="2OqNvi">
-                                      <ref role="37wK5l" to="33ny:~Map$Entry.getKey():java.lang.Object" resolve="getKey" />
+                                      <ref role="37wK5l" to="33ny:~Map$Entry.getKey()" resolve="getKey" />
                                     </node>
                                   </node>
                                   <node concept="Xl_RD" id="4F3SXIF5J_B" role="3uHU7w">
@@ -1758,7 +1758,7 @@
                           <ref role="3cqZAo" node="4ZcizIatOSE" resolve="value" />
                         </node>
                         <node concept="liA8E" id="4ZcizIatRax" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.split(java.lang.String):java.lang.String[]" resolve="split" />
+                          <ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
                           <node concept="Xl_RD" id="4ZcizIatRvw" role="37wK5m">
                             <property role="Xl_RC" value="\n" />
                           </node>
@@ -1796,7 +1796,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="4F3SXIF5J_H" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~Map.entrySet():java.util.Set" resolve="entrySet" />
+                      <ref role="37wK5l" to="33ny:~Map.entrySet()" resolve="entrySet" />
                     </node>
                   </node>
                 </node>
@@ -1853,7 +1853,7 @@
                 <ref role="3cqZAo" node="5mr7UHcbsDS" resolve="evaluationResult" />
               </node>
               <node concept="liA8E" id="5jCHAT1QROI" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~EvaluationResult.storeView():jetbrains.mps.logic.reactor.evaluation.StoreView" resolve="storeView" />
+                <ref role="37wK5l" to="w7la:~EvaluationResult.storeView()" resolve="storeView" />
               </node>
             </node>
           </node>
@@ -1873,7 +1873,7 @@
                           <ref role="3cqZAo" node="5mr7UHcc5Jp" resolve="cs" />
                         </node>
                         <node concept="liA8E" id="7nkyKX7hbMm" role="2OqNvi">
-                          <ref role="37wK5l" to="av0y:~Symbol.id():java.lang.String" resolve="id" />
+                          <ref role="37wK5l" to="av0y:~Symbol.id()" resolve="id" />
                         </node>
                       </node>
                     </node>
@@ -1934,7 +1934,7 @@
                   <ref role="3cqZAo" node="5jCHAT1QROF" resolve="storeView" />
                 </node>
                 <node concept="liA8E" id="5mr7UHcct$i" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~StoreView.occurrences(jetbrains.mps.logic.reactor.program.ConstraintSymbol):java.lang.Iterable" resolve="occurrences" />
+                  <ref role="37wK5l" to="w7la:~StoreView.occurrences(jetbrains.mps.logic.reactor.program.ConstraintSymbol)" resolve="occurrences" />
                   <node concept="37vLTw" id="5mr7UHcctGr" role="37wK5m">
                     <ref role="3cqZAo" node="5mr7UHcc5Jp" resolve="cs" />
                   </node>
@@ -1953,7 +1953,7 @@
               <ref role="3cqZAo" node="5jCHAT1QROF" resolve="storeView" />
             </node>
             <node concept="liA8E" id="5mr7UHcc6U$" role="2OqNvi">
-              <ref role="37wK5l" to="w7la:~StoreView.constraintSymbols():java.lang.Iterable" resolve="constraintSymbols" />
+              <ref role="37wK5l" to="w7la:~StoreView.constraintSymbols()" resolve="constraintSymbols" />
             </node>
           </node>
         </node>
@@ -2183,7 +2183,7 @@
               <ref role="3cqZAo" node="2tjs8VC16TI" resolve="current" />
             </node>
             <node concept="liA8E" id="2tjs8VC1bcJ" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~ThreadLocal.get():java.lang.Object" resolve="get" />
+              <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
             </node>
           </node>
         </node>
@@ -2268,7 +2268,7 @@
                 <ref role="3cqZAo" node="2tjs8VC16TI" resolve="current" />
               </node>
               <node concept="liA8E" id="2tjs8VC1cW0" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~ThreadLocal.get():java.lang.Object" resolve="get" />
+                <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
               </node>
             </node>
           </node>
@@ -2279,7 +2279,7 @@
               <ref role="3cqZAo" node="2tjs8VC16TI" resolve="current" />
             </node>
             <node concept="liA8E" id="2tjs8VC1dWX" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object):void" resolve="set" />
+              <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object)" resolve="set" />
               <node concept="2ShNRf" id="2tjs8VC1e6B" role="37wK5m">
                 <node concept="1pGfFk" id="2tjs8VC1exZ" role="2ShVmc">
                   <ref role="37wK5l" node="2tjs8VC15lz" resolve="Memoizer" />
@@ -2310,7 +2310,7 @@
                 <ref role="3cqZAo" node="2tjs8VC16TI" resolve="current" />
               </node>
               <node concept="liA8E" id="2tjs8VC1g0H" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~ThreadLocal.get():java.lang.Object" resolve="get" />
+                <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
               </node>
             </node>
           </node>
@@ -2338,7 +2338,7 @@
               <ref role="3cqZAo" node="2tjs8VC16TI" resolve="current" />
             </node>
             <node concept="liA8E" id="2tjs8VC1jZK" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object):void" resolve="set" />
+              <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object)" resolve="set" />
               <node concept="2OqwBi" id="2tjs8VC1km2" role="37wK5m">
                 <node concept="37vLTw" id="2tjs8VC1kbj" role="2Oq$k0">
                   <ref role="3cqZAo" node="2tjs8VC1g0E" resolve="curr" />
@@ -2527,7 +2527,7 @@
               <ref role="3cqZAo" node="2tjs8VC0WHe" resolve="token2value" />
             </node>
             <node concept="liA8E" id="2tjs8VC0Ymq" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
+              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
               <node concept="37vLTw" id="2tjs8VC0Yrk" role="37wK5m">
                 <ref role="3cqZAo" node="2tjs8VC0VXg" resolve="token" />
               </node>
@@ -2583,7 +2583,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="2tjs8VC29LN" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
                   <node concept="37vLTw" id="2tjs8VC29LO" role="37wK5m">
                     <ref role="3cqZAo" node="2tjs8VC1Yjd" resolve="token" />
                   </node>
@@ -2684,7 +2684,7 @@
                 <ref role="3cqZAo" node="2tjs8VC1Pmh" resolve="defaultValue" />
               </node>
               <node concept="liA8E" id="2tjs8VC2iz5" role="2OqNvi">
-                <ref role="37wK5l" to="18ew:~Computable.compute():java.lang.Object" resolve="compute" />
+                <ref role="37wK5l" to="18ew:~Computable.compute()" resolve="compute" />
               </node>
             </node>
           </node>
@@ -2695,7 +2695,7 @@
               <ref role="3cqZAo" node="2tjs8VC0WHe" resolve="token2value" />
             </node>
             <node concept="liA8E" id="2tjs8VC2h3S" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
+              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
               <node concept="37vLTw" id="2tjs8VC2hxn" role="37wK5m">
                 <ref role="3cqZAo" node="2tjs8VC1OGQ" resolve="token" />
               </node>
@@ -2765,7 +2765,7 @@
                 <ref role="3cqZAo" node="2tjs8VC0WHe" resolve="token2value" />
               </node>
               <node concept="liA8E" id="2tjs8VC24Mw" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object):boolean" resolve="containsKey" />
+                <ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object)" resolve="containsKey" />
                 <node concept="37vLTw" id="2tjs8VC24Mx" role="37wK5m">
                   <ref role="3cqZAo" node="2tjs8VC23ZY" resolve="token" />
                 </node>
@@ -2790,7 +2790,7 @@
               <ref role="3cqZAo" node="2tjs8VC0WHe" resolve="token2value" />
             </node>
             <node concept="liA8E" id="2tjs8VC1mbI" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.clear():void" resolve="clear" />
+              <ref role="37wK5l" to="33ny:~Map.clear()" resolve="clear" />
             </node>
           </node>
         </node>
@@ -3006,16 +3006,16 @@
                   <ref role="37wK5l" node="7Oc59RSEnG3" resolve="errors" />
                 </node>
                 <node concept="liA8E" id="7nkyKX7vfHY" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Collection.size():int" resolve="size" />
+                  <ref role="37wK5l" to="33ny:~Collection.size()" resolve="size" />
                 </node>
               </node>
               <node concept="3cpWs3" id="7Oc59RSJuJa" role="3uHU7B">
                 <node concept="2OqwBi" id="7Oc59RSJssQ" role="3uHU7B">
                   <node concept="1rXfSq" id="7Oc59RSJs9F" role="2Oq$k0">
-                    <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                    <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                   </node>
                   <node concept="liA8E" id="7Oc59RSJuyR" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Class.getSimpleName():java.lang.String" resolve="getSimpleName" />
+                    <ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="7Oc59RSJvII" role="3uHU7w">
@@ -3094,7 +3094,7 @@
         <node concept="3clFbS" id="7Oc59RSJpwm" role="3clF47">
           <node concept="3clFbF" id="7nkyKX7v6HU" role="3cqZAp">
             <node concept="2YIFZM" id="7nkyKX7v6Kr" role="3clFbG">
-              <ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
+              <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
               <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
             </node>
           </node>
@@ -3149,7 +3149,7 @@
                   <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(java.util.Collection)" resolve="ArrayList" />
                   <node concept="2YIFZM" id="7nkyKX7v2p8" role="37wK5m">
                     <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-                    <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+                    <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
                     <node concept="37vLTw" id="7nkyKX7v2u2" role="37wK5m">
                       <ref role="3cqZAo" node="7Oc59RSEpH8" resolve="errors" />
                     </node>
@@ -3202,7 +3202,7 @@
                     <ref role="3cqZAo" node="7Oc59RSEpOr" resolve="errors" />
                   </node>
                   <node concept="liA8E" id="7nkyKX7veew" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
+                    <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
                     <node concept="2OqwBi" id="7nkyKX7veoK" role="37wK5m">
                       <node concept="37vLTw" id="7nkyKX7velW" role="2Oq$k0">
                         <ref role="3cqZAo" node="7nkyKX7vdty" resolve="r" />
@@ -3292,7 +3292,7 @@
         <node concept="3clFbS" id="7Oc59RSEqG7" role="3clF47">
           <node concept="3clFbF" id="7nkyKX7v4QN" role="3cqZAp">
             <node concept="2YIFZM" id="7nkyKX7v4VU" role="3clFbG">
-              <ref role="37wK5l" to="33ny:~Collections.unmodifiableCollection(java.util.Collection):java.util.Collection" resolve="unmodifiableCollection" />
+              <ref role="37wK5l" to="33ny:~Collections.unmodifiableCollection(java.util.Collection)" resolve="unmodifiableCollection" />
               <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
               <node concept="37vLTw" id="7nkyKX7v5n9" role="37wK5m">
                 <ref role="3cqZAo" node="7Oc59RSEpOr" resolve="errors" />
@@ -3332,7 +3332,7 @@
                     <ref role="3cqZAo" node="6i42QSsnrzl" resolve="joiner" />
                   </node>
                   <node concept="liA8E" id="6i42QSsntDu" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~StringJoiner.add(java.lang.CharSequence):java.util.StringJoiner" resolve="add" />
+                    <ref role="37wK5l" to="33ny:~StringJoiner.add(java.lang.CharSequence)" resolve="add" />
                     <node concept="2OqwBi" id="6i42QSsntSG" role="37wK5m">
                       <node concept="37vLTw" id="6i42QSsntN$" role="2Oq$k0">
                         <ref role="3cqZAo" node="6i42QSsns_L" resolve="err" />
@@ -3361,7 +3361,7 @@
                 <ref role="3cqZAo" node="6i42QSsnrzl" resolve="joiner" />
               </node>
               <node concept="liA8E" id="6i42QSsnwLn" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~StringJoiner.toString():java.lang.String" resolve="toString" />
+                <ref role="37wK5l" to="33ny:~StringJoiner.toString()" resolve="toString" />
               </node>
             </node>
           </node>
@@ -3483,7 +3483,7 @@
                         <ref role="3cqZAo" node="6i42QSs$lhF" resolve="exception" />
                       </node>
                       <node concept="liA8E" id="6i42QSs$lhv" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Throwable.toString():java.lang.String" resolve="toString" />
+                        <ref role="37wK5l" to="wyt6:~Throwable.toString()" resolve="toString" />
                       </node>
                     </node>
                   </node>
@@ -3981,10 +3981,10 @@
               <node concept="3cpWs3" id="12yN8DyLiXM" role="3uHU7B">
                 <node concept="2OqwBi" id="7Oc59RSEbhU" role="3uHU7B">
                   <node concept="1rXfSq" id="7Oc59RSEaXF" role="2Oq$k0">
-                    <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                    <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                   </node>
                   <node concept="liA8E" id="7Oc59RSEbW0" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Class.getSimpleName():java.lang.String" resolve="getSimpleName" />
+                    <ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="12yN8DyLiXU" role="3uHU7w">
@@ -4872,11 +4872,11 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="1HWyn8jwRsY" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                      <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                     </node>
                   </node>
                   <node concept="liA8E" id="1HWyn8jwS1m" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="1HWyn8jwPwV" role="37vLTJ">
@@ -5058,7 +5058,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="1HWyn8jvsPX" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                      <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                     </node>
                   </node>
                 </node>
@@ -5069,7 +5069,7 @@
                     <ref role="3cqZAo" node="1HWyn8jvsPM" resolve="logical" />
                   </node>
                   <node concept="liA8E" id="1HWyn8jvtwx" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                    <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                   </node>
                 </node>
                 <node concept="9aQIb" id="1HWyn8jvsQo" role="9aQIa">
@@ -5087,7 +5087,7 @@
                             <ref role="3cqZAo" node="1HWyn8jvsPa" resolve="logicalMap" />
                           </node>
                           <node concept="liA8E" id="1HWyn8jvJG_" role="2OqNvi">
-                            <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
+                            <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
                             <node concept="37vLTw" id="1HWyn8jvKfA" role="37wK5m">
                               <ref role="3cqZAo" node="1HWyn8jvsPM" resolve="logical" />
                             </node>
@@ -5113,13 +5113,13 @@
                                 <ref role="3cqZAo" node="1HWyn8jvsP6" resolve="logicalContext" />
                               </node>
                               <node concept="liA8E" id="1HWyn8jvtua" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
+                                <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="variable" />
                                 <node concept="2OqwBi" id="1HWyn8jvuI2" role="37wK5m">
                                   <node concept="37vLTw" id="1HWyn8jvuI1" role="2Oq$k0">
                                     <ref role="3cqZAo" node="1HWyn8jvsPM" resolve="logical" />
                                   </node>
                                   <node concept="liA8E" id="1HWyn8jvuI3" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~Logical.metaLogical():jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="metaLogical" />
+                                    <ref role="37wK5l" to="bj13:~Logical.metaLogical()" resolve="metaLogical" />
                                   </node>
                                 </node>
                               </node>
@@ -5132,7 +5132,7 @@
                               <ref role="3cqZAo" node="1HWyn8jvsPa" resolve="logicalMap" />
                             </node>
                             <node concept="liA8E" id="1HWyn8jvMBt" role="2OqNvi">
-                              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
+                              <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
                               <node concept="37vLTw" id="1HWyn8jvMUM" role="37wK5m">
                                 <ref role="3cqZAo" node="1HWyn8jvsPM" resolve="logical" />
                               </node>
@@ -5169,7 +5169,7 @@
                           <ref role="3cqZAo" node="1HWyn8jvsPM" resolve="logical" />
                         </node>
                         <node concept="liA8E" id="1HWyn8jvt_V" role="2OqNvi">
-                          <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                          <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                         </node>
                       </node>
                     </node>
@@ -6007,7 +6007,7 @@
                 <node concept="1pGfFk" id="7kTeLbPnP2q" role="2ShVmc">
                   <ref role="37wK5l" to="i348:4sSe4$oM2rk" resolve="ConstraintBuilder" />
                   <node concept="2YIFZM" id="7kTeLbPnP2r" role="37wK5m">
-                    <ref role="37wK5l" to="av0y:~ConstraintSymbol.symbol(java.lang.String,int):jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                    <ref role="37wK5l" to="av0y:~ConstraintSymbol.symbol(java.lang.String,int)" resolve="symbol" />
                     <ref role="1Pybhc" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
                     <node concept="Xl_RD" id="7kTeLbPnP2s" role="37wK5m">
                       <property role="Xl_RC" value="main" />
@@ -6752,11 +6752,11 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3pMFS1zdqnP" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                      <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                     </node>
                   </node>
                   <node concept="liA8E" id="3pMFS1zdqnQ" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="3pMFS1zdqnR" role="37vLTJ">
@@ -6807,11 +6807,11 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3pMFS1zdGE9" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                      <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                     </node>
                   </node>
                   <node concept="liA8E" id="3pMFS1zdGEa" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                   </node>
                 </node>
               </node>
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index a79d35bd..9f6af967 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
@@ -597,7 +597,7 @@
       <node concept="3clFbS" id="4MqhgXUKgMh" role="3clF47">
         <node concept="3clFbF" id="4MqhgXUT$0V" role="3cqZAp">
           <node concept="2YIFZM" id="4MqhgXUT$36" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
             <node concept="37vLTw" id="4MqhgXUT$4h" role="37wK5m">
               <ref role="3cqZAo" node="4MqhgXULUc0" resolve="handlers" />
@@ -626,10 +626,10 @@
               <node concept="3cpWs3" id="7Oc59RSE7HS" role="3uHU7B">
                 <node concept="2OqwBi" id="7Oc59RSE3ij" role="3uHU7B">
                   <node concept="1rXfSq" id="7Oc59RSE2Pl" role="2Oq$k0">
-                    <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                    <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                   </node>
                   <node concept="liA8E" id="7Oc59RSE3pt" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Class.getSimpleName():java.lang.String" resolve="getSimpleName" />
+                    <ref role="37wK5l" to="wyt6:~Class.getSimpleName()" resolve="getSimpleName" />
                   </node>
                 </node>
                 <node concept="Xl_RD" id="7Oc59RSE7MB" role="3uHU7w">
@@ -708,14 +708,14 @@
       <node concept="3clFbS" id="78CwJJcXKos" role="3clF47">
         <node concept="3clFbF" id="78CwJJcXKot" role="3cqZAp">
           <node concept="2YIFZM" id="78CwJJcXKou" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.unmodifiableSet(java.util.Set):java.util.Set" resolve="unmodifiableSet" />
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableSet(java.util.Set)" resolve="unmodifiableSet" />
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
             <node concept="2OqwBi" id="78CwJJcXKov" role="37wK5m">
               <node concept="37vLTw" id="78CwJJcXKow" role="2Oq$k0">
                 <ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
               </node>
               <node concept="liA8E" id="78CwJJcXKox" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.keySet():java.util.Set" resolve="keySet" />
+                <ref role="37wK5l" to="33ny:~Map.keySet()" resolve="keySet" />
               </node>
             </node>
           </node>
@@ -736,14 +736,14 @@
       <node concept="3clFbS" id="78CwJJcXcEw" role="3clF47">
         <node concept="3clFbF" id="78CwJJcXfFE" role="3cqZAp">
           <node concept="2YIFZM" id="78CwJJcXnYO" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
             <node concept="2OqwBi" id="78CwJJcXo6Q" role="37wK5m">
               <node concept="37vLTw" id="78CwJJcXo2d" role="2Oq$k0">
                 <ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
               </node>
               <node concept="liA8E" id="78CwJJcXofr" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
+                <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
                 <node concept="37vLTw" id="78CwJJcXpeO" role="37wK5m">
                   <ref role="3cqZAo" node="78CwJJcXom8" resolve="constraintSymbol" />
                 </node>
@@ -772,7 +772,7 @@
       <node concept="3clFbS" id="ZqZbw4RIlP" role="3clF47">
         <node concept="3clFbF" id="ZqZbw4RKWT" role="3cqZAp">
           <node concept="2YIFZM" id="ZqZbw4RKXF" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.unmodifiableSet(java.util.Set):java.util.Set" resolve="unmodifiableSet" />
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableSet(java.util.Set)" resolve="unmodifiableSet" />
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
             <node concept="37vLTw" id="78CwJJcXRtE" role="37wK5m">
               <ref role="3cqZAo" node="7ISVfSJtsW" resolve="solvers" />
@@ -816,11 +816,11 @@
                         <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                       </node>
                       <node concept="liA8E" id="30XHGaOWeZv" role="2OqNvi">
-                        <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.List" resolve="arguments" />
+                        <ref role="37wK5l" to="av0y:~AndItem.arguments()" resolve="arguments" />
                       </node>
                     </node>
                     <node concept="liA8E" id="30XHGaOWfgx" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                      <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="7eGEHDlg3RX" role="3uHU7B">
@@ -829,11 +829,11 @@
                         <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                       </node>
                       <node concept="liA8E" id="30XHGaP5pQG" role="2OqNvi">
-                        <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="7eGEHDlg3RZ" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Symbol.arity():int" resolve="arity" />
+                      <ref role="37wK5l" to="av0y:~Symbol.arity()" resolve="arity" />
                     </node>
                   </node>
                 </node>
@@ -850,13 +850,13 @@
                       <node concept="3cpWs3" id="7Oc59RSHQew" role="37wK5m">
                         <node concept="2YIFZM" id="7Oc59RSHQex" role="3uHU7w">
                           <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                           <node concept="2OqwBi" id="7Oc59RSHQey" role="37wK5m">
                             <node concept="37vLTw" id="5uFPQ7BEpeQ" role="2Oq$k0">
                               <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                             </node>
                             <node concept="liA8E" id="7Oc59RSHQe$" role="2OqNvi">
-                              <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                              <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                             </node>
                           </node>
                         </node>
@@ -902,13 +902,13 @@
                                       </node>
                                       <node concept="2YIFZM" id="1zN1RIln3iG" role="3uHU7w">
                                         <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                        <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                        <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                                         <node concept="2OqwBi" id="1zN1RIln3iH" role="37wK5m">
                                           <node concept="37vLTw" id="5uFPQ7BEsjZ" role="2Oq$k0">
                                             <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                                           </node>
                                           <node concept="liA8E" id="1zN1RIln3iJ" role="2OqNvi">
-                                            <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                                            <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                                           </node>
                                         </node>
                                       </node>
@@ -922,7 +922,7 @@
                                       <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                                     </node>
                                     <node concept="liA8E" id="4sSe4$prSgx" role="2OqNvi">
-                                      <ref role="37wK5l" to="av0y:~Constraint.argumentTypes():java.util.List" resolve="argumentTypes" />
+                                      <ref role="37wK5l" to="av0y:~Constraint.argumentTypes()" resolve="argumentTypes" />
                                     </node>
                                   </node>
                                 </node>
@@ -935,13 +935,13 @@
                                   <ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
                                 </node>
                                 <node concept="liA8E" id="4sSe4$prWcT" role="2OqNvi">
-                                  <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
+                                  <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
                                   <node concept="2OqwBi" id="4sSe4$prWcU" role="37wK5m">
                                     <node concept="37vLTw" id="4sSe4$prWcV" role="2Oq$k0">
                                       <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                                     </node>
                                     <node concept="liA8E" id="4sSe4$prWcW" role="2OqNvi">
-                                      <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                                      <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                                     </node>
                                   </node>
                                 </node>
@@ -958,23 +958,23 @@
                             <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                           </node>
                           <node concept="liA8E" id="78CwJJcX3RX" role="2OqNvi">
-                            <ref role="37wK5l" to="av0y:~Constraint.argumentTypes():java.util.List" resolve="argumentTypes" />
+                            <ref role="37wK5l" to="av0y:~Constraint.argumentTypes()" resolve="argumentTypes" />
                           </node>
                         </node>
                         <node concept="liA8E" id="78CwJJcX49I" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~List.equals(java.lang.Object):boolean" resolve="equals" />
+                          <ref role="37wK5l" to="33ny:~List.equals(java.lang.Object)" resolve="equals" />
                           <node concept="2OqwBi" id="30XHGaP5H3s" role="37wK5m">
                             <node concept="37vLTw" id="30XHGaP5H3t" role="2Oq$k0">
                               <ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
                             </node>
                             <node concept="liA8E" id="30XHGaP5H3u" role="2OqNvi">
-                              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
+                              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
                               <node concept="2OqwBi" id="30XHGaP5H3v" role="37wK5m">
                                 <node concept="37vLTw" id="5uFPQ7BEs2s" role="2Oq$k0">
                                   <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                                 </node>
                                 <node concept="liA8E" id="30XHGaP5H3x" role="2OqNvi">
-                                  <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                                  <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                                 </node>
                               </node>
                             </node>
@@ -990,13 +990,13 @@
                   <ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
                 </node>
                 <node concept="liA8E" id="7eGEHDleLnR" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object):boolean" resolve="containsKey" />
+                  <ref role="37wK5l" to="33ny:~Map.containsKey(java.lang.Object)" resolve="containsKey" />
                   <node concept="2OqwBi" id="7eGEHDleLtw" role="37wK5m">
                     <node concept="37vLTw" id="5uFPQ7BEppf" role="2Oq$k0">
                       <ref role="3cqZAo" node="5uFPQ7BEo4w" resolve="cst" />
                     </node>
                     <node concept="liA8E" id="7eGEHDleLzH" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -1049,13 +1049,13 @@
                         <node concept="3cpWs3" id="2pvEdquuFKF" role="37wK5m">
                           <node concept="2YIFZM" id="2pvEdquuFKG" role="3uHU7w">
                             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                             <node concept="2OqwBi" id="2pvEdquuFKH" role="37wK5m">
                               <node concept="37vLTw" id="5uFPQ7BEvpY" role="2Oq$k0">
                                 <ref role="3cqZAo" node="5uFPQ7BEu6z" resolve="pred" />
                               </node>
                               <node concept="liA8E" id="2pvEdquuFKJ" role="2OqNvi">
-                                <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                                <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                               </node>
                             </node>
                           </node>
@@ -1074,11 +1074,11 @@
                         <ref role="3cqZAo" node="5uFPQ7BEu6z" resolve="pred" />
                       </node>
                       <node concept="liA8E" id="30XHGaOWeEi" role="2OqNvi">
-                        <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.List" resolve="arguments" />
+                        <ref role="37wK5l" to="av0y:~AndItem.arguments()" resolve="arguments" />
                       </node>
                     </node>
                     <node concept="liA8E" id="30XHGaOWeVo" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                      <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="2pvEdquuFm4" role="3uHU7w">
@@ -1087,11 +1087,11 @@
                         <ref role="3cqZAo" node="5uFPQ7BEu6z" resolve="pred" />
                       </node>
                       <node concept="liA8E" id="2pvEdquuFma" role="2OqNvi">
-                        <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="2pvEdquuFmb" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Symbol.arity():int" resolve="arity" />
+                      <ref role="37wK5l" to="av0y:~Symbol.arity()" resolve="arity" />
                     </node>
                   </node>
                 </node>
@@ -1110,14 +1110,14 @@
                       <ref role="37wK5l" to="av0y:~InvalidConstraintException.&lt;init&gt;(java.lang.String)" resolve="InvalidConstraintException" />
                       <node concept="3cpWs3" id="2KVRGowWD$u" role="37wK5m">
                         <node concept="2YIFZM" id="2KVRGowWDMj" role="3uHU7w">
-                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                          <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                           <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                           <node concept="2OqwBi" id="2KVRGowWE4s" role="37wK5m">
                             <node concept="37vLTw" id="2KVRGowWDWb" role="2Oq$k0">
                               <ref role="3cqZAo" node="7eGEHDldphF" resolve="item" />
                             </node>
                             <node concept="liA8E" id="2KVRGowWEea" role="2OqNvi">
-                              <ref role="37wK5l" to="av0y:~AndItem.symbol():jetbrains.mps.logic.reactor.program.Symbol" resolve="symbol" />
+                              <ref role="37wK5l" to="av0y:~AndItem.symbol()" resolve="symbol" />
                             </node>
                           </node>
                         </node>
@@ -1149,7 +1149,7 @@
               <ref role="3cqZAo" node="7eGEHDldphF" resolve="item" />
             </node>
             <node concept="liA8E" id="2KVRGowW$Kw" role="2OqNvi">
-              <ref role="37wK5l" to="av0y:~AndItem.arguments():java.util.List" resolve="arguments" />
+              <ref role="37wK5l" to="av0y:~AndItem.arguments()" resolve="arguments" />
             </node>
           </node>
         </node>
@@ -1201,13 +1201,13 @@
                   <ref role="3cqZAo" node="7eGEHDley5W" resolve="constraintArgTypes" />
                 </node>
                 <node concept="liA8E" id="7eGEHDleQZ$" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
+                  <ref role="37wK5l" to="33ny:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
                   <node concept="2OqwBi" id="7eGEHDleR63" role="37wK5m">
                     <node concept="37vLTw" id="5uFPQ7BH1JL" role="2Oq$k0">
                       <ref role="3cqZAo" node="5uFPQ7BH1yJ" resolve="cst" />
                     </node>
                     <node concept="liA8E" id="7eGEHDleRaS" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="78CwJJcWZ_9" role="37wK5m">
@@ -1215,7 +1215,7 @@
                       <ref role="3cqZAo" node="5uFPQ7BH1yJ" resolve="cst" />
                     </node>
                     <node concept="liA8E" id="78CwJJcWZFx" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Constraint.argumentTypes():java.util.List" resolve="argumentTypes" />
+                      <ref role="37wK5l" to="av0y:~Constraint.argumentTypes()" resolve="argumentTypes" />
                     </node>
                   </node>
                 </node>
@@ -1263,13 +1263,13 @@
                     <ref role="3cqZAo" node="7ISVfSJtsW" resolve="solvers" />
                   </node>
                   <node concept="liA8E" id="7ISVfSJvtA" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~Set.add(java.lang.Object):boolean" resolve="add" />
+                    <ref role="37wK5l" to="33ny:~Set.add(java.lang.Object)" resolve="add" />
                     <node concept="2OqwBi" id="78CwJJcX$kh" role="37wK5m">
                       <node concept="37vLTw" id="78CwJJcX$fr" role="2Oq$k0">
                         <ref role="3cqZAo" node="5uFPQ7BH2qT" resolve="pred" />
                       </node>
                       <node concept="liA8E" id="78CwJJcX$qQ" role="2OqNvi">
-                        <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                       </node>
                     </node>
                   </node>
@@ -1587,7 +1587,7 @@
               </node>
             </node>
             <node concept="2YIFZM" id="4MqhgXUNJ$f" role="37vLTx">
-              <ref role="37wK5l" to="33ny:~Collections.unmodifiableMap(java.util.Map):java.util.Map" resolve="unmodifiableMap" />
+              <ref role="37wK5l" to="33ny:~Collections.unmodifiableMap(java.util.Map)" resolve="unmodifiableMap" />
               <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
               <node concept="37vLTw" id="4MqhgXUNJJ2" role="37wK5m">
                 <ref role="3cqZAo" node="4MqhgXUMgHN" resolve="location2rules" />
@@ -2778,7 +2778,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="2$$Q_FeUWXQ" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                     <node concept="2OqwBi" id="2$$Q_FeUUS1" role="37wK5m">
                       <node concept="2OqwBi" id="2$$Q_FeUUqF" role="2Oq$k0">
                         <node concept="2GrUjf" id="2$$Q_FeUUhy" role="2Oq$k0">
@@ -3819,7 +3819,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="70Wv0dJk23L" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                 </node>
               </node>
             </node>
@@ -3987,7 +3987,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="70Wv0dJkdpc" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                 </node>
               </node>
             </node>
@@ -4307,7 +4307,7 @@
                   <ref role="3cqZAo" node="4MqhgXUQrZn" resolve="handler" />
                 </node>
                 <node concept="liA8E" id="4MqhgXUQtEx" role="2OqNvi">
-                  <ref role="37wK5l" to="av0y:~RulesList.rules():java.lang.Iterable" resolve="rules" />
+                  <ref role="37wK5l" to="av0y:~RulesList.rules()" resolve="rules" />
                 </node>
               </node>
             </node>
@@ -4331,7 +4331,7 @@
                           <ref role="3cqZAo" node="4MqhgXUQtfR" resolve="e" />
                         </node>
                         <node concept="liA8E" id="4MqhgXUQtUt" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                          <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                         </node>
                       </node>
                       <node concept="Xl_RD" id="4MqhgXUQtUu" role="3uHU7B">
@@ -4409,7 +4409,7 @@
               <ref role="3cqZAo" node="7eGEHDldi8e" resolve="rule" />
             </node>
             <node concept="liA8E" id="7eGEHDldjbN" role="2OqNvi">
-              <ref role="37wK5l" to="av0y:~Rule.all():java.lang.Iterable" resolve="all" />
+              <ref role="37wK5l" to="av0y:~Rule.all()" resolve="all" />
             </node>
           </node>
         </node>
@@ -4457,7 +4457,7 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="4$YN6QuXrWD" role="2OqNvi">
-                          <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                          <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                         </node>
                       </node>
                     </node>
@@ -4477,7 +4477,7 @@
               <ref role="3cqZAo" node="7eGEHDldi8e" resolve="rule" />
             </node>
             <node concept="liA8E" id="7eGEHDlf0Ok" role="2OqNvi">
-              <ref role="37wK5l" to="av0y:~Rule.all():java.lang.Iterable" resolve="all" />
+              <ref role="37wK5l" to="av0y:~Rule.all()" resolve="all" />
             </node>
           </node>
         </node>
@@ -5091,7 +5091,7 @@
                       <ref role="3cqZAo" node="7nkyKX7nl0T" resolve="e" />
                     </node>
                     <node concept="liA8E" id="6i42QSsp6Fm" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                      <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                     </node>
                   </node>
                 </node>
@@ -5714,7 +5714,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="19wqdqOfE34" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SModel.getModelId():org.jetbrains.mps.openapi.model.SModelId" resolve="getModelId" />
+                            <ref role="37wK5l" to="mhbf:~SModel.getModelId()" resolve="getModelId" />
                           </node>
                         </node>
                         <node concept="3cpWs3" id="19wqdqOfoa3" role="3uHU7B">
@@ -5744,7 +5744,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="2DKqMqOksM8" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                                <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
                               </node>
                             </node>
                           </node>
@@ -5905,7 +5905,7 @@
                   <property role="TrG5h" value="details" />
                   <node concept="17QB3L" id="6OXbTDyaL$N" role="1tU5fm" />
                   <node concept="2YIFZM" id="6OXbTDycVSX" role="33vP2m">
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="37vLTw" id="6OXbTDyd7qU" role="37wK5m">
                       <ref role="3cqZAo" node="6OXbTDycbjU" resolve="parameter" />
@@ -6710,7 +6710,7 @@
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="2DKqMqOkcAK" role="2OqNvi">
-                                      <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                                      <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
                                     </node>
                                   </node>
                                   <node concept="3cpWs3" id="2DKqMqOkcAL" role="3uHU7B">
@@ -6758,7 +6758,7 @@
                                                 <ref role="3cqZAo" node="tIwzd1I3X5" resolve="e" />
                                               </node>
                                               <node concept="liA8E" id="6i42QSss4RY" role="2OqNvi">
-                                                <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                                                <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                               </node>
                                             </node>
                                             <node concept="Xl_RD" id="6i42QSss4RZ" role="3uHU7w">
@@ -7130,7 +7130,7 @@
                           <property role="TrG5h" value="details" />
                           <node concept="17QB3L" id="6OXbTDydY25" role="1tU5fm" />
                           <node concept="2YIFZM" id="6OXbTDyeyio" role="33vP2m">
-                            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                             <node concept="37vLTw" id="6OXbTDyeyYP" role="37wK5m">
                               <ref role="3cqZAo" node="6OXbTDyaDvN" resolve="parameter" />
@@ -7161,7 +7161,7 @@
                                             <ref role="3cqZAo" node="6OXbTDydX1x" resolve="e" />
                                           </node>
                                           <node concept="liA8E" id="6OXbTDydY2$" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                                            <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                           </node>
                                         </node>
                                         <node concept="Xl_RD" id="6OXbTDydY2_" role="3uHU7w">
@@ -7170,7 +7170,7 @@
                                       </node>
                                       <node concept="2OqwBi" id="6OXbTDydY2A" role="3uHU7w">
                                         <node concept="liA8E" id="6OXbTDydY2C" role="2OqNvi">
-                                          <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                                         </node>
                                         <node concept="37vLTw" id="6tPOoeTbwWq" role="2Oq$k0">
                                           <ref role="3cqZAo" node="6OXbTDydhIZ" resolve="queryTemplate" />
diff --git a/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl b/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl
index 15939362..dbb91877 100644
--- a/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl
+++ b/coderules/languages/jetbrains.mps.lang.controlflow/jetbrains.mps.lang.controlflow.mpl
@@ -31,13 +31,13 @@
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -113,9 +113,9 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl b/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
index e1a5f8c3..8c4093f6 100644
--- a/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
+++ b/coderules/languages/jetbrains.mps.lang.smodel.types/jetbrains.mps.lang.smodel.types.mpl
@@ -24,12 +24,12 @@
         <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="-1" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -90,16 +90,16 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
index fc7b2c5a..d7b42bb6 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/generator/template/main@generator.mps
@@ -4,8 +4,8 @@
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="69b8a993-9b87-4d96-bf0c-3559f4bb0c63" name="jetbrains.mps.lang.slanguage" version="0" />
     <devkit ref="a2eb3a43-fcc2-4200-80dc-c60110c4862d(jetbrains.mps.devkit.templates)" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
index 32facca1..9063122c 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/jetbrains.mps.lang.typechecking.mpl
@@ -39,13 +39,13 @@
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
         <language slang="l:69b8a993-9b87-4d96-bf0c-3559f4bb0c63:jetbrains.mps.lang.slanguage" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -124,9 +124,9 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps
index 74816e2a..d47de6bd 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/plugin.mps
@@ -6,7 +6,7 @@
     <use id="696c1165-4a59-463b-bc5d-902caab85dd0" name="jetbrains.mps.make.facet" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
     <use id="c9d137c4-3259-44f8-80ff-33ab2b506ee4" name="jetbrains.mps.lang.util.order" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports />
diff --git a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
index a3ff3ca8..56af4f16 100644
--- a/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.lang.typechecking/models/typesystem.mps
@@ -4,8 +4,8 @@
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
index 76d280e9..46c381c3 100644
--- a/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.logic/generator/template/main@generator.mps
@@ -3,11 +3,11 @@
   <persistence version="9" />
   <languages>
     <use id="b401a680-8325-4110-8fd3-84331ff25bef" name="jetbrains.mps.lang.generator" version="2" />
-    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="0" />
+    <use id="d7706f63-9be2-479c-a3da-ae92af1e64d5" name="jetbrains.mps.lang.generator.generationContext" version="1" />
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
@@ -428,7 +428,7 @@
             <node concept="2OqwBi" id="28ktUhrkeJN" role="3clFbG">
               <node concept="2OqwBi" id="28ktUhrke9D" role="2Oq$k0">
                 <node concept="liA8E" id="28ktUhrkepZ" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                 </node>
                 <node concept="37vLTw" id="74q$MmSc9e2" role="2Oq$k0">
                   <ref role="3cqZAo" node="74q$MmSc8Yr" resolve="logical" />
@@ -449,7 +449,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="28ktUhrkfqr" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
               <node concept="raruj" id="74q$MmSc9gY" role="lGtFl" />
             </node>
@@ -1846,7 +1846,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="7HUwyZaNQGE" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
+                <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int)" resolve="logicalAt" />
                 <node concept="3cmrfG" id="7HUwyZaNQHA" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                   <node concept="29HgVG" id="7HUwyZaNQHB" role="lGtFl">
diff --git a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
index 03e26c0c..908a8fbf 100644
--- a/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
+++ b/coderules/languages/jetbrains.mps.logic/jetbrains.mps.logic.mpl
@@ -30,10 +30,11 @@
         <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -46,8 +47,6 @@
         <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
         <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
         <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
-        <module reference="985c8c6a-64b4-486d-a91e-7d4112742556(jetbrains.mps.baseLanguage#1129914002933)" version="0" />
-        <module reference="857d0a79-6f44-4f46-84ed-9c5b42632011(jetbrains.mps.baseLanguage.closures#1199623535494)" version="0" />
         <module reference="5f9babc9-8d5d-4825-8e61-17b241ee6272(jetbrains.mps.baseLanguage.collections#1151699677197)" version="0" />
         <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
         <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
@@ -110,18 +109,18 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
index 430e9749..c96a4840 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/behavior.mps
@@ -5,7 +5,7 @@
     <use id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior" version="2" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
index 7dfe6c2a..e212c7eb 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/constraints.mps
@@ -5,7 +5,7 @@
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
index 79a40b86..99429a74 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/editor.mps
@@ -5,7 +5,7 @@
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
@@ -2944,7 +2944,7 @@
               </node>
               <node concept="2YIFZM" id="5yj19qaZwIW" role="33vP2m">
                 <ref role="1Pybhc" to="ykok:~ModelConstraints" resolve="ModelConstraints" />
-                <ref role="37wK5l" to="ykok:~ModelConstraints.getReferenceDescriptor(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.language.SContainmentLink,int,org.jetbrains.mps.openapi.language.SReferenceLink,org.jetbrains.mps.openapi.language.SAbstractConcept):jetbrains.mps.smodel.constraints.ReferenceDescriptor" resolve="getReferenceDescriptor" />
+                <ref role="37wK5l" to="ykok:~ModelConstraints.getReferenceDescriptor(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.language.SContainmentLink,int,org.jetbrains.mps.openapi.language.SReferenceLink,org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="getReferenceDescriptor" />
                 <node concept="3bvxqY" id="5yj19qaZwIX" role="37wK5m" />
                 <node concept="10Nm6u" id="5yj19qaZKuw" role="37wK5m" />
                 <node concept="3cmrfG" id="5yj19qaZwIZ" role="37wK5m">
@@ -2971,11 +2971,11 @@
                     <ref role="3cqZAo" node="5yj19qaZwIV" resolve="rd" />
                   </node>
                   <node concept="liA8E" id="4hPXq9JmeuE" role="2OqNvi">
-                    <ref role="37wK5l" to="ykok:~ReferenceDescriptor.getScope():jetbrains.mps.scope.Scope" resolve="getScope" />
+                    <ref role="37wK5l" to="ykok:~ReferenceDescriptor.getScope()" resolve="getScope" />
                   </node>
                 </node>
                 <node concept="liA8E" id="4hPXq9JmeuF" role="2OqNvi">
-                  <ref role="37wK5l" to="35tq:~Scope.getAvailableElements(java.lang.String):java.lang.Iterable" resolve="getAvailableElements" />
+                  <ref role="37wK5l" to="35tq:~Scope.getAvailableElements(java.lang.String)" resolve="getAvailableElements" />
                   <node concept="Xl_RD" id="4hPXq9JmeuG" role="37wK5m">
                     <property role="Xl_RC" value="" />
                   </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
index b0ae2f24..c7081cb4 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/intentions.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="13744753-c81f-424a-9c1b-cf8943bf4e86" name="jetbrains.mps.lang.sharedConcepts" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
@@ -211,7 +211,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6dMt3c55VaG" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.createNode(org.jetbrains.mps.openapi.language.SConcept):org.jetbrains.mps.openapi.model.SNode" resolve="createNode" />
+                <ref role="37wK5l" to="mhbf:~SModel.createNode(org.jetbrains.mps.openapi.language.SConcept)" resolve="createNode" />
                 <node concept="10QFUN" id="6dMt3c55VaH" role="37wK5m">
                   <node concept="3uibUv" id="6dMt3c55VaI" role="10QFUM">
                     <ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
@@ -250,7 +250,7 @@
       <node concept="3clFbS" id="6dMt3c55sOH" role="2VODD2">
         <node concept="3clFbF" id="6dMt3c55sXJ" role="3cqZAp">
           <node concept="2YIFZM" id="6dMt3c55th2" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+            <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
             <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
             <node concept="35c_gC" id="6dMt3c55LmV" role="37wK5m">
               <ref role="35c_gD" to="5j4j:dfChU1zo4B" resolve="Splice" />
@@ -475,7 +475,7 @@
           <node concept="2OqwBi" id="2L$SfAAVDFR" role="3clFbG">
             <node concept="1XNTG" id="2L$SfAAVCjP" role="2Oq$k0" />
             <node concept="liA8E" id="2L$SfAAVEvn" role="2OqNvi">
-              <ref role="37wK5l" to="cj4x:~EditorContext.selectWRTFocusPolicy(org.jetbrains.mps.openapi.model.SNode):void" resolve="selectWRTFocusPolicy" />
+              <ref role="37wK5l" to="cj4x:~EditorContext.selectWRTFocusPolicy(org.jetbrains.mps.openapi.model.SNode)" resolve="selectWRTFocusPolicy" />
               <node concept="37vLTw" id="2L$SfABaakS" role="37wK5m">
                 <ref role="3cqZAo" node="2L$SfABaabI" resolve="attr" />
               </node>
diff --git a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
index e0ea8207..c2e68164 100644
--- a/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
+++ b/coderules/languages/jetbrains.mps.logic/languageModels/typesystem.mps
@@ -4,8 +4,8 @@
   <languages>
     <use id="7a5dda62-9140-4668-ab76-d5ed1746f2b2" name="jetbrains.mps.lang.typesystem" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <devkit ref="00000000-0000-4000-0000-1de82b3a4936(jetbrains.mps.devkit.aspect.typesystem)" />
   </languages>
   <imports>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
index 1363ac34..802d7689 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
+++ b/coderules/languages/jetbrains.mps.logic/runtime/jetbrains.mps.logic.runtime.msd
@@ -18,12 +18,13 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:96ee7a94-411d-4cf8-9b94-96cad7e52411:jetbrains.mps.baseLanguage.jdk7" version="0" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
index e237d847..189d2978 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
@@ -433,7 +433,7 @@
         <node concept="3clFbF" id="104EUzFNW3t" role="3cqZAp">
           <node concept="2YIFZM" id="104EUzFNW3u" role="3clFbG">
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-            <ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
+            <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
           </node>
         </node>
       </node>
@@ -507,22 +507,22 @@
           <node concept="2OqwBi" id="56MMu0Ar9PY" role="3clFbG">
             <node concept="2YIFZM" id="56MMu0Ar9PZ" role="2Oq$k0">
               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
               <node concept="1rXfSq" id="56MMu0Ar9Q0" role="37wK5m">
                 <ref role="37wK5l" node="1msb0mq8QTt" resolve="symbol" />
               </node>
             </node>
             <node concept="liA8E" id="56MMu0Ar9Q1" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String):int" resolve="compareTo" />
+              <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
               <node concept="2YIFZM" id="56MMu0Ar9Q2" role="37wK5m">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                 <node concept="2OqwBi" id="56MMu0Ar9Q3" role="37wK5m">
                   <node concept="37vLTw" id="56MMu0Ar9Q4" role="2Oq$k0">
                     <ref role="3cqZAo" node="56MMu0Ar0iQ" resolve="node" />
                   </node>
                   <node concept="liA8E" id="56MMu0Ar9Q5" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Term.symbol():java.lang.Object" resolve="symbol" />
+                    <ref role="37wK5l" to="yt73:~Term.symbol()" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -699,7 +699,7 @@
       <node concept="3clFbS" id="5JQSuNs$cde" role="3clF47">
         <node concept="3clFbF" id="5JQSuNs$cTq" role="3cqZAp">
           <node concept="2YIFZM" id="5JQSuNs$d5U" role="3clFbG">
-            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
             <node concept="1rXfSq" id="6$jH9oLlPTn" role="37wK5m">
               <ref role="37wK5l" node="1msb0mq8QTt" resolve="symbol" />
@@ -758,7 +758,7 @@
               <node concept="2OqwBi" id="1mP5b6jQ_A4" role="3uHU7B">
                 <node concept="Xjq3P" id="1mP5b6jQ_A5" role="2Oq$k0" />
                 <node concept="liA8E" id="1mP5b6jQ_A6" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                 </node>
               </node>
               <node concept="2OqwBi" id="1mP5b6jQ_A7" role="3uHU7w">
@@ -766,7 +766,7 @@
                   <ref role="3cqZAo" node="1mP5b6jQ_Ah" resolve="o" />
                 </node>
                 <node concept="liA8E" id="1mP5b6jQ_A9" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                 </node>
               </node>
             </node>
@@ -801,7 +801,7 @@
             <node concept="3fqX7Q" id="1mP5b6jQ_Aw" role="3K4E3e">
               <node concept="2OqwBi" id="1mP5b6jQ_Ax" role="3fr31v">
                 <node concept="liA8E" id="1mP5b6jQ_Ay" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                   <node concept="2OqwBi" id="1mP5b6jQ_Az" role="37wK5m">
                     <node concept="37vLTw" id="1mP5b6jQ_Ak" role="2Oq$k0">
                       <ref role="3cqZAo" node="1mP5b6jQ_Ac" resolve="that" />
@@ -883,7 +883,7 @@
                   </node>
                   <node concept="2OqwBi" id="1mP5b6jQ_Ba" role="3K4E3e">
                     <node concept="liA8E" id="1mP5b6jQ_Be" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
+                      <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
                     </node>
                     <node concept="37vLTw" id="1mP5b6jQ_B1" role="2Oq$k0">
                       <ref role="3cqZAo" node="1msb0mq8QXA" resolve="symbol" />
@@ -1219,11 +1219,11 @@
         </node>
         <node concept="3clFbF" id="5YIOneORZDL" role="3cqZAp">
           <node concept="2YIFZM" id="5YIOneORZOB" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.unmodifiableCollection(java.util.Collection):java.util.Collection" resolve="unmodifiableCollection" />
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableCollection(java.util.Collection)" resolve="unmodifiableCollection" />
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
             <node concept="2YIFZM" id="5YIOneOMGZb" role="37wK5m">
               <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
               <node concept="37vLTw" id="5YIOneOMH5Z" role="37wK5m">
                 <ref role="3cqZAo" node="5YIOneOMG9O" resolve="valuesArr" />
               </node>
@@ -1404,10 +1404,10 @@
                     <ref role="3cqZAo" node="2q_78a93qs2" resolve="sb" />
                   </node>
                   <node concept="liA8E" id="2q_78a93qsd" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="2YIFZM" id="2q_78a93qse" role="37wK5m">
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                       <node concept="1rXfSq" id="1OShD0HF7Km" role="37wK5m">
                         <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
                       </node>
@@ -1415,21 +1415,21 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="2q_78a93qsi" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="Xl_RD" id="2q_78a93qsj" role="37wK5m">
                     <property role="Xl_RC" value="=\&quot;" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="6YPNC4OEgmh" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.Object):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.Object)" resolve="append" />
                 <node concept="1rXfSq" id="6YPNC4OEiPO" role="37wK5m">
                   <ref role="37wK5l" node="6YPNC4OE9DW" resolve="argument" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="6YPNC4OEl2o" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
               <node concept="Xl_RD" id="6YPNC4OEl3g" role="37wK5m">
                 <property role="Xl_RC" value="\&quot;" />
               </node>
@@ -1442,7 +1442,7 @@
               <ref role="3cqZAo" node="2q_78a93qs2" resolve="sb" />
             </node>
             <node concept="liA8E" id="2q_78a93qsL" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1548,11 +1548,11 @@
       <node concept="3clFbS" id="5JQSuNswjSk" role="3clF47">
         <node concept="3clFbF" id="5JQSuNswjSl" role="3cqZAp">
           <node concept="2YIFZM" id="5JQSuNswjSm" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.unmodifiableCollection(java.util.Collection):java.util.Collection" resolve="unmodifiableCollection" />
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableCollection(java.util.Collection)" resolve="unmodifiableCollection" />
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
             <node concept="2YIFZM" id="5JQSuNswjSn" role="37wK5m">
               <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
               <node concept="37vLTw" id="5JQSuNswjSo" role="37wK5m">
                 <ref role="3cqZAo" node="5JQSuNswjST" resolve="arguments" />
               </node>
@@ -1658,23 +1658,23 @@
         <node concept="3clFbF" id="56MMu0AqQuC" role="3cqZAp">
           <node concept="2OqwBi" id="56MMu0AqQX$" role="3clFbG">
             <node concept="2YIFZM" id="56MMu0AqQzB" role="2Oq$k0">
-              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
               <node concept="1rXfSq" id="56MMu0AqQGg" role="37wK5m">
                 <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
               </node>
             </node>
             <node concept="liA8E" id="56MMu0AqR_U" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String):int" resolve="compareTo" />
+              <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
               <node concept="2YIFZM" id="56MMu0AqRL4" role="37wK5m">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                 <node concept="2OqwBi" id="56MMu0AqSaO" role="37wK5m">
                   <node concept="37vLTw" id="56MMu0AqRRz" role="2Oq$k0">
                     <ref role="3cqZAo" node="56MMu0AqMKr" resolve="node" />
                   </node>
                   <node concept="liA8E" id="56MMu0AqSsI" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Term.symbol():java.lang.Object" resolve="symbol" />
+                    <ref role="37wK5l" to="yt73:~Term.symbol()" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -1874,7 +1874,7 @@
               <node concept="2OqwBi" id="1mP5b6jP_I7" role="3uHU7B">
                 <node concept="Xjq3P" id="1mP5b6jP_I8" role="2Oq$k0" />
                 <node concept="liA8E" id="1mP5b6jP_I9" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                 </node>
               </node>
               <node concept="2OqwBi" id="1mP5b6jP_Ia" role="3uHU7w">
@@ -1882,7 +1882,7 @@
                   <ref role="3cqZAo" node="1mP5b6jP_Ik" resolve="o" />
                 </node>
                 <node concept="liA8E" id="1mP5b6jP_Ic" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                 </node>
               </node>
             </node>
@@ -1909,7 +1909,7 @@
           <node concept="3fqX7Q" id="1mP5b6jP_It" role="3clFbw">
             <node concept="2YIFZM" id="1mP5b6jP_Iu" role="3fr31v">
               <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-              <ref role="37wK5l" to="33ny:~Arrays.equals(java.lang.Object[],java.lang.Object[]):boolean" resolve="equals" />
+              <ref role="37wK5l" to="33ny:~Arrays.equals(java.lang.Object[],java.lang.Object[])" resolve="equals" />
               <node concept="37vLTw" id="1mP5b6jP_Iq" role="37wK5m">
                 <ref role="3cqZAo" node="5JQSuNswjST" resolve="arguments" />
               </node>
@@ -1963,7 +1963,7 @@
           <node concept="3K4zz7" id="1mP5b6jP_IF" role="3cqZAk">
             <node concept="2OqwBi" id="1mP5b6jP_IH" role="3K4E3e">
               <node concept="liA8E" id="1mP5b6jP_II" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                 <node concept="2OqwBi" id="4sgxfjnCGsi" role="37wK5m">
                   <node concept="2OqwBi" id="1mP5b6jP_IJ" role="2Oq$k0">
                     <node concept="37vLTw" id="1mP5b6jP_IK" role="2Oq$k0">
@@ -2047,7 +2047,7 @@
                   </node>
                   <node concept="2YIFZM" id="1mP5b6jP_Ji" role="3K4E3e">
                     <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
-                    <ref role="37wK5l" to="33ny:~Arrays.hashCode(java.lang.Object[]):int" resolve="hashCode" />
+                    <ref role="37wK5l" to="33ny:~Arrays.hashCode(java.lang.Object[])" resolve="hashCode" />
                     <node concept="37vLTw" id="1mP5b6jP_Ja" role="37wK5m">
                       <ref role="3cqZAo" node="5JQSuNswjST" resolve="arguments" />
                     </node>
@@ -2103,7 +2103,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="52tOIisbuCi" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
+                      <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
                     </node>
                   </node>
                 </node>
@@ -3045,7 +3045,7 @@
                   <ref role="3cqZAo" node="6YPNC4NHPNK" resolve="that" />
                 </node>
                 <node concept="liA8E" id="6YPNC4NIA3h" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                 </node>
               </node>
             </node>
@@ -3106,10 +3106,10 @@
                   </node>
                   <node concept="2OqwBi" id="6YPNC4NHWJf" role="3uHU7B">
                     <node concept="1rXfSq" id="6YPNC4NHWJg" role="2Oq$k0">
-                      <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                      <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                     </node>
                     <node concept="liA8E" id="6YPNC4NHWJh" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
+                      <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
                     </node>
                   </node>
                 </node>
@@ -3249,7 +3249,7 @@
       <node concept="3clFbS" id="56MMu0Ark7s" role="3clF47">
         <node concept="3clFbF" id="QXE1ZChM6X" role="3cqZAp">
           <node concept="2YIFZM" id="QXE1ZChMnb" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
+            <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
           </node>
         </node>
@@ -3277,26 +3277,26 @@
             <node concept="3cpWs6" id="56MMu0ArxkU" role="3cqZAp">
               <node concept="2OqwBi" id="56MMu0ArxkV" role="3cqZAk">
                 <node concept="2YIFZM" id="56MMu0ArxkW" role="2Oq$k0">
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                   <node concept="2OqwBi" id="56MMu0ArxkX" role="37wK5m">
                     <node concept="Xjq3P" id="56MMu0ArxkY" role="2Oq$k0" />
                     <node concept="liA8E" id="56MMu0ArxkZ" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                      <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                     </node>
                   </node>
                 </node>
                 <node concept="liA8E" id="56MMu0Arxl0" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String):int" resolve="compareTo" />
+                  <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
                   <node concept="2YIFZM" id="56MMu0Arxl1" role="37wK5m">
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                     <node concept="2OqwBi" id="56MMu0Arxl2" role="37wK5m">
                       <node concept="37vLTw" id="56MMu0Arxl3" role="2Oq$k0">
                         <ref role="3cqZAo" node="56MMu0Ark7R" resolve="that" />
                       </node>
                       <node concept="liA8E" id="56MMu0Arxl4" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                        <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                       </node>
                     </node>
                   </node>
@@ -3310,13 +3310,13 @@
                 <ref role="3cqZAo" node="56MMu0Ark7R" resolve="that" />
               </node>
               <node concept="liA8E" id="56MMu0Arxl8" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
               </node>
             </node>
             <node concept="2OqwBi" id="56MMu0Arxl9" role="3uHU7w">
               <node concept="Xjq3P" id="56MMu0Arxla" role="2Oq$k0" />
               <node concept="liA8E" id="56MMu0Arxlb" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
               </node>
             </node>
           </node>
@@ -3325,22 +3325,22 @@
           <node concept="2OqwBi" id="56MMu0AruF_" role="3clFbG">
             <node concept="2YIFZM" id="56MMu0AruFA" role="2Oq$k0">
               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
               <node concept="1rXfSq" id="56MMu0AruFB" role="37wK5m">
-                <ref role="37wK5l" to="yt73:~Term.symbol():java.lang.Object" resolve="symbol" />
+                <ref role="37wK5l" to="yt73:~Term.symbol()" resolve="symbol" />
               </node>
             </node>
             <node concept="liA8E" id="56MMu0AruFC" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String):int" resolve="compareTo" />
+              <ref role="37wK5l" to="wyt6:~String.compareTo(java.lang.String)" resolve="compareTo" />
               <node concept="2YIFZM" id="56MMu0AruFD" role="37wK5m">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                 <node concept="2OqwBi" id="56MMu0AruFE" role="37wK5m">
                   <node concept="37vLTw" id="56MMu0AruFF" role="2Oq$k0">
                     <ref role="3cqZAo" node="56MMu0Ark7R" resolve="that" />
                   </node>
                   <node concept="liA8E" id="56MMu0AruFG" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Term.symbol():java.lang.Object" resolve="symbol" />
+                    <ref role="37wK5l" to="yt73:~Term.symbol()" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -3581,7 +3581,7 @@
                 <node concept="1pGfFk" id="1R$Cm9qF359" role="2ShVmc">
                   <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
                   <node concept="2YIFZM" id="4sgxfjnCjCc" role="37wK5m">
-                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="Xl_RD" id="4sgxfjnCbUu" role="37wK5m">
                       <property role="Xl_RC" value="path element mismatch: %s != %s" />
@@ -3625,7 +3625,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4sgxfjnCaHt" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                   <node concept="2OqwBi" id="4sgxfjnCu7z" role="37wK5m">
                     <node concept="37vLTw" id="4sgxfjnCb78" role="2Oq$k0">
                       <ref role="3cqZAo" node="1R$Cm9qEroV" resolve="prev" />
@@ -3713,7 +3713,7 @@
               <ref role="37wK5l" node="1R$Cm9qE$U4" resolve="toString" />
             </node>
             <node concept="liA8E" id="1R$Cm9qHpCu" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
               <node concept="2OqwBi" id="1R$Cm9qHrrJ" role="37wK5m">
                 <node concept="1eOMI4" id="1R$Cm9qHpDM" role="2Oq$k0">
                   <node concept="10QFUN" id="1R$Cm9qHpDJ" role="1eOMHV">
@@ -3753,7 +3753,7 @@
                   <ref role="37wK5l" node="1R$Cm9qE$U4" resolve="toString" />
                 </node>
                 <node concept="liA8E" id="1R$Cm9qHtjb" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.hashCode():int" resolve="hashCode" />
+                  <ref role="37wK5l" to="wyt6:~String.hashCode()" resolve="hashCode" />
                 </node>
               </node>
               <node concept="3cmrfG" id="1R$Cm9qHsdT" role="3uHU7B">
@@ -3790,7 +3790,7 @@
               <node concept="10Nm6u" id="1R$Cm9qF6Br" role="37wK5m" />
             </node>
             <node concept="liA8E" id="1R$Cm9qGit8" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -3819,7 +3819,7 @@
                     <ref role="3cqZAo" node="1R$Cm9qFOPp" resolve="sb" />
                   </node>
                   <node concept="2YIFZM" id="1R$Cm9qGvJd" role="37wK5m">
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="37vLTw" id="1R$Cm9qGvJe" role="37wK5m">
                       <ref role="3cqZAo" node="1R$Cm9qEw26" resolve="symbolElement" />
@@ -3843,9 +3843,9 @@
                     <ref role="3cqZAo" node="1R$Cm9qFOPp" resolve="sb" />
                   </node>
                   <node concept="liA8E" id="1R$Cm9qGxHt" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="2YIFZM" id="1R$Cm9qGxIf" role="37wK5m">
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                       <node concept="37vLTw" id="1R$Cm9qGxIg" role="37wK5m">
                         <ref role="3cqZAo" node="1R$Cm9qEw26" resolve="symbolElement" />
@@ -3863,7 +3863,7 @@
               <ref role="3cqZAo" node="1R$Cm9qFOPp" resolve="sb" />
             </node>
             <node concept="liA8E" id="1R$Cm9qGbR1" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
               <node concept="3K4zz7" id="1R$Cm9qGc6D" role="37wK5m">
                 <node concept="3cpWs3" id="1R$Cm9qGc6E" role="3K4E3e">
                   <node concept="37vLTw" id="1R$Cm9qGc6F" role="3uHU7w">
@@ -4622,17 +4622,17 @@
               <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
             </node>
             <node concept="liA8E" id="47nvOnTW06r" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
               <node concept="2OqwBi" id="47nvOnTWeCu" role="37wK5m">
                 <node concept="2YIFZM" id="47nvOnTWcOV" role="2Oq$k0">
-                  <ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object):java.util.List" resolve="singletonList" />
+                  <ref role="37wK5l" to="33ny:~Collections.singletonList(java.lang.Object)" resolve="singletonList" />
                   <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                   <node concept="37vLTw" id="104EUzGgdJC" role="37wK5m">
                     <ref role="3cqZAo" node="1hOy_Afq6Lg" resolve="tp" />
                   </node>
                 </node>
                 <node concept="liA8E" id="47nvOnTWg4c" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
+                  <ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
                 </node>
               </node>
             </node>
@@ -4656,7 +4656,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="47nvOnTRBJL" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                   </node>
                 </node>
               </node>
@@ -4669,7 +4669,7 @@
                       <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                     </node>
                     <node concept="liA8E" id="47nvOnTRBJR" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                      <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
                     </node>
                   </node>
                 </node>
@@ -4692,7 +4692,7 @@
                         <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                       </node>
                       <node concept="liA8E" id="5s497VraD7l" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty():boolean" resolve="isEmpty" />
+                        <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty()" resolve="isEmpty" />
                       </node>
                     </node>
                   </node>
@@ -4704,7 +4704,7 @@
                     <ref role="3cqZAo" node="47nvOnTRBJF" resolve="it" />
                   </node>
                   <node concept="liA8E" id="47nvOnTRBJV" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                    <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
                   </node>
                 </node>
               </node>
@@ -4721,7 +4721,7 @@
                           <ref role="3cqZAo" node="47nvOnTRBJF" resolve="it" />
                         </node>
                         <node concept="liA8E" id="7d$oK1$HfcU" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                          <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                         </node>
                       </node>
                     </node>
@@ -4747,7 +4747,7 @@
                 <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
               </node>
               <node concept="liA8E" id="47nvOnTRBK5" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty():boolean" resolve="isEmpty" />
+                <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty()" resolve="isEmpty" />
               </node>
             </node>
           </node>
@@ -4782,7 +4782,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="47nvOnTSUj0" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
                     <node concept="2OqwBi" id="47nvOnTT2Mr" role="37wK5m">
                       <node concept="2OqwBi" id="47nvOnTT0lp" role="2Oq$k0">
                         <node concept="37vLTw" id="47nvOnTSZEY" role="2Oq$k0">
@@ -4793,7 +4793,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="47nvOnTT3X$" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                        <ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
                       </node>
                     </node>
                   </node>
@@ -4823,7 +4823,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="47nvOnTTCT9" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.clear():void" resolve="clear" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.clear()" resolve="clear" />
                   </node>
                 </node>
               </node>
@@ -4881,7 +4881,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="6YPNC4NZAW$" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
                     <node concept="2OqwBi" id="6YPNC4NZAW_" role="37wK5m">
                       <node concept="2OqwBi" id="6YPNC4NZAWA" role="2Oq$k0">
                         <node concept="37vLTw" id="6YPNC4NZDCR" role="2Oq$k0">
@@ -4892,7 +4892,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="6YPNC4NZAWD" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                        <ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
                       </node>
                     </node>
                   </node>
@@ -4922,7 +4922,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="6YPNC4NZAWP" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.clear():void" resolve="clear" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.clear()" resolve="clear" />
                   </node>
                 </node>
               </node>
@@ -4980,7 +4980,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="6YPNC4OF4f1" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
                     <node concept="2OqwBi" id="6YPNC4OF4f2" role="37wK5m">
                       <node concept="2OqwBi" id="6YPNC4OF4f3" role="2Oq$k0">
                         <node concept="37vLTw" id="6YPNC4OFa3o" role="2Oq$k0">
@@ -4991,7 +4991,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="6YPNC4OF4f6" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                        <ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
                       </node>
                     </node>
                   </node>
@@ -5021,7 +5021,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="6YPNC4OF4fi" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.clear():void" resolve="clear" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.clear()" resolve="clear" />
                   </node>
                 </node>
               </node>
@@ -5103,7 +5103,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="5s497VqonAW" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
                     <node concept="2OqwBi" id="5s497VqoCMn" role="37wK5m">
                       <node concept="2OqwBi" id="5YIOneOUA7N" role="2Oq$k0">
                         <node concept="37vLTw" id="5YIOneOUA02" role="2Oq$k0">
@@ -5114,7 +5114,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="5s497VqoCMp" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
+                        <ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
                       </node>
                     </node>
                   </node>
@@ -5211,7 +5211,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="104EUzFXYpi" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
                     <node concept="2OqwBi" id="104EUzFXZ5o" role="37wK5m">
                       <node concept="2OqwBi" id="104EUzFXZ5p" role="2Oq$k0">
                         <node concept="37vLTw" id="104EUzFXZ5q" role="2Oq$k0">
@@ -5222,7 +5222,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="104EUzFXZ5s" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                        <ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
                       </node>
                     </node>
                   </node>
@@ -5252,7 +5252,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="47nvOnTUhxL" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.clear():void" resolve="clear" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.clear()" resolve="clear" />
                   </node>
                 </node>
               </node>
@@ -5326,7 +5326,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="104EUzG88vj" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.clear():void" resolve="clear" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.clear()" resolve="clear" />
                   </node>
                 </node>
               </node>
@@ -5402,7 +5402,7 @@
                     <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
                   </node>
                   <node concept="liA8E" id="104EUzG7VYI" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.clear():void" resolve="clear" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.clear()" resolve="clear" />
                   </node>
                 </node>
               </node>
@@ -5459,7 +5459,7 @@
               <ref role="3cqZAo" node="47nvOnTQQyc" resolve="stack" />
             </node>
             <node concept="liA8E" id="3JgCwkqpAPx" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~LinkedList.clear():void" resolve="clear" />
+              <ref role="37wK5l" to="33ny:~LinkedList.clear()" resolve="clear" />
             </node>
           </node>
         </node>
@@ -6081,7 +6081,7 @@
                 <node concept="1pGfFk" id="3OPtF03oA1l" role="2ShVmc">
                   <ref role="37wK5l" to="33ny:~LinkedList.&lt;init&gt;(java.util.Collection)" resolve="LinkedList" />
                   <node concept="2YIFZM" id="3OPtF03oA1m" role="37wK5m">
-                    <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+                    <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
                     <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
                     <node concept="37vLTw" id="3OPtF03oA1n" role="37wK5m">
                       <ref role="3cqZAo" node="3OPtF03oA19" resolve="symbolPath" />
@@ -6187,7 +6187,7 @@
                     <ref role="3cqZAo" node="3OPtF03oA4e" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="428_4iYQRxy" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
                   </node>
                 </node>
               </node>
@@ -6207,7 +6207,7 @@
                     <ref role="3cqZAo" node="3OPtF03oA4e" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="428_4iYQRxE" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="428_4iYQRxF" role="37wK5m">
@@ -6223,7 +6223,7 @@
                     <ref role="3cqZAo" node="3OPtF03oA4e" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="428_4iYQRxK" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.size():int" resolve="size" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.size()" resolve="size" />
                   </node>
                 </node>
               </node>
@@ -6247,7 +6247,7 @@
                     <ref role="3cqZAo" node="3OPtF03oA4e" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="428_4iYQRxU" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.size():int" resolve="size" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.size()" resolve="size" />
                   </node>
                 </node>
               </node>
@@ -6291,7 +6291,7 @@
                     <ref role="3cqZAo" node="3OPtF03oA4e" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="3OPtF03oA2P" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
                   </node>
                 </node>
               </node>
@@ -6310,11 +6310,11 @@
                     <ref role="3cqZAo" node="3OPtF03oA4e" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="3OPtF03oA2W" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                   </node>
                 </node>
                 <node concept="2YIFZM" id="6YPNC4NT1Kf" role="3uHU7B">
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                   <node concept="2OqwBi" id="3OPtF03oA2X" role="37wK5m">
                     <node concept="37vLTw" id="428_4iYRywH" role="2Oq$k0">
@@ -6332,7 +6332,7 @@
                     <ref role="3cqZAo" node="3OPtF03oA4e" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="428_4iYQG8m" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.size():int" resolve="size" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.size()" resolve="size" />
                   </node>
                 </node>
                 <node concept="3cmrfG" id="428_4iYQJQ5" role="3uHU7w">
@@ -6346,7 +6346,7 @@
                   <ref role="3cqZAo" node="3OPtF03oA4e" resolve="symbolPath" />
                 </node>
                 <node concept="liA8E" id="5f6wxQ2Xxft" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty():boolean" resolve="isEmpty" />
+                  <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty()" resolve="isEmpty" />
                 </node>
               </node>
               <node concept="3clFbS" id="5f6wxQ2XpsR" role="3eOfB_">
@@ -6430,7 +6430,7 @@
                 <ref role="3cqZAo" node="3OPtF03oA4e" resolve="symbolPath" />
               </node>
               <node concept="liA8E" id="3t7_2FgAYw1" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty():boolean" resolve="isEmpty" />
+                <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty()" resolve="isEmpty" />
               </node>
             </node>
           </node>
@@ -6478,13 +6478,13 @@
               </node>
               <node concept="2YIFZM" id="428_4iYRQ9P" role="3uHU7w">
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <node concept="2OqwBi" id="428_4iYRQ9Q" role="37wK5m">
                   <node concept="37vLTw" id="428_4iYRQ9R" role="2Oq$k0">
                     <ref role="3cqZAo" node="428_4iYRQ9H" resolve="term" />
                   </node>
                   <node concept="liA8E" id="428_4iYRQ9S" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Term.symbol():java.lang.Object" resolve="symbol" />
+                    <ref role="37wK5l" to="yt73:~Term.symbol()" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -6565,7 +6565,7 @@
                 <node concept="1pGfFk" id="3JgCwkqd8vM" role="2ShVmc">
                   <ref role="37wK5l" to="33ny:~LinkedList.&lt;init&gt;(java.util.Collection)" resolve="LinkedList" />
                   <node concept="2YIFZM" id="3JgCwkqd8vN" role="37wK5m">
-                    <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+                    <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
                     <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
                     <node concept="37vLTw" id="3JgCwkqd8vO" role="37wK5m">
                       <ref role="3cqZAo" node="3JgCwkqd8vA" resolve="symbolPath" />
@@ -6671,7 +6671,7 @@
                     <ref role="3cqZAo" node="3JgCwkqd8xC" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="3JgCwkqd8wl" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
                   </node>
                 </node>
               </node>
@@ -6691,7 +6691,7 @@
                     <ref role="3cqZAo" node="3JgCwkqd8xC" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="29_L5zQS0Wo" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="29_L5zQRV2b" role="37wK5m">
@@ -6707,7 +6707,7 @@
                     <ref role="3cqZAo" node="3JgCwkqd8xC" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="428_4iYvgfG" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.size():int" resolve="size" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.size()" resolve="size" />
                   </node>
                 </node>
               </node>
@@ -6731,7 +6731,7 @@
                     <ref role="3cqZAo" node="3JgCwkqd8xC" resolve="symbolPath" />
                   </node>
                   <node concept="liA8E" id="428_4iYvsNI" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.size():int" resolve="size" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.size()" resolve="size" />
                   </node>
                 </node>
               </node>
@@ -6817,7 +6817,7 @@
                   <ref role="3cqZAo" node="3JgCwkqd8xC" resolve="symbolPath" />
                 </node>
                 <node concept="liA8E" id="3JgCwkqd8wS" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~LinkedList.size():int" resolve="size" />
+                  <ref role="37wK5l" to="33ny:~LinkedList.size()" resolve="size" />
                 </node>
               </node>
             </node>
@@ -6843,11 +6843,11 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="5NAQwIkF192" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                        <ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
                       </node>
                     </node>
                     <node concept="liA8E" id="5NAQwIkF193" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                      <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                     </node>
                   </node>
                 </node>
@@ -6879,7 +6879,7 @@
                   <ref role="3cqZAo" node="3JgCwkqd8xC" resolve="symbolPath" />
                 </node>
                 <node concept="liA8E" id="29_L5zQSban" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                  <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                 </node>
               </node>
               <node concept="37vLTw" id="29_L5zQSdUA" role="37wK5m">
@@ -6931,14 +6931,14 @@
                 <ref role="3cqZAo" node="29_L5zQRAq8" resolve="symbol" />
               </node>
               <node concept="2YIFZM" id="6YPNC4NT2Nl" role="3uHU7w">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                 <node concept="2OqwBi" id="29_L5zQROic" role="37wK5m">
                   <node concept="37vLTw" id="29_L5zQRMWS" role="2Oq$k0">
                     <ref role="3cqZAo" node="29_L5zQRDDl" resolve="term" />
                   </node>
                   <node concept="liA8E" id="29_L5zQRPCe" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Term.symbol():java.lang.Object" resolve="symbol" />
+                    <ref role="37wK5l" to="yt73:~Term.symbol()" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -7055,23 +7055,23 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="29_L5zQTkVA" role="2OqNvi">
-                      <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence):java.util.regex.Matcher" resolve="matcher" />
+                      <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence)" resolve="matcher" />
                       <node concept="2YIFZM" id="29_L5zQTt4_" role="37wK5m">
-                        <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                        <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                         <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                         <node concept="2OqwBi" id="29_L5zQTnC7" role="37wK5m">
                           <node concept="37vLTw" id="29_L5zQTmhy" role="2Oq$k0">
                             <ref role="3cqZAo" node="29_L5zQSM3O" resolve="term" />
                           </node>
                           <node concept="liA8E" id="29_L5zQToZJ" role="2OqNvi">
-                            <ref role="37wK5l" to="yt73:~Term.symbol():java.lang.Object" resolve="symbol" />
+                            <ref role="37wK5l" to="yt73:~Term.symbol()" resolve="symbol" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="29_L5zQTxaL" role="2OqNvi">
-                    <ref role="37wK5l" to="ni5j:~Matcher.matches():boolean" resolve="matches" />
+                    <ref role="37wK5l" to="ni5j:~Matcher.matches()" resolve="matches" />
                   </node>
                 </node>
               </node>
@@ -7719,7 +7719,7 @@
         </node>
         <node concept="3clFbF" id="5YIOneOTD8W" role="3cqZAp">
           <node concept="2YIFZM" id="5YIOneOTNYX" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
             <node concept="37vLTw" id="5YIOneOTNYY" role="37wK5m">
               <ref role="3cqZAo" node="5YIOneOT7XX" resolve="list" />
@@ -7820,10 +7820,10 @@
                 <ref role="3cqZAo" node="2q_78a92HDc" resolve="sb" />
               </node>
               <node concept="liA8E" id="2q_78a92HDk" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="2YIFZM" id="2q_78a92HDl" role="37wK5m">
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                   <node concept="1rXfSq" id="1OShD0HF0sV" role="37wK5m">
                     <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
                   </node>
@@ -7831,7 +7831,7 @@
               </node>
             </node>
             <node concept="liA8E" id="2q_78a92HDp" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
               <node concept="Xl_RD" id="2q_78a92HDq" role="37wK5m">
                 <property role="Xl_RC" value="=[" />
               </node>
@@ -7854,20 +7854,20 @@
                     <ref role="3cqZAo" node="2q_78a92HDc" resolve="sb" />
                   </node>
                   <node concept="liA8E" id="2q_78a92HD_" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="37vLTw" id="2q_78a92HDA" role="37wK5m">
                       <ref role="3cqZAo" node="2q_78a92HDs" resolve="sep" />
                     </node>
                   </node>
                 </node>
                 <node concept="liA8E" id="2q_78a92HDB" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="2OqwBi" id="2q_78a92HDC" role="37wK5m">
                     <node concept="37vLTw" id="2q_78a92HDD" role="2Oq$k0">
                       <ref role="3cqZAo" node="2q_78a92HDJ" resolve="br" />
                     </node>
                     <node concept="liA8E" id="2q_78a92HDE" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                     </node>
                   </node>
                 </node>
@@ -7901,14 +7901,14 @@
                 <ref role="3cqZAo" node="2q_78a92HDc" resolve="sb" />
               </node>
               <node concept="liA8E" id="2q_78a92HDR" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="Xl_RD" id="2q_78a92HDS" role="37wK5m">
                   <property role="Xl_RC" value="]" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="2q_78a92HDT" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -8198,7 +8198,7 @@
           <node concept="3clFbF" id="3OPtF03lcxw" role="3cqZAp">
             <node concept="3cpWs3" id="3OPtF03lcxx" role="3clFbG">
               <node concept="2YIFZM" id="3OPtF03lcxy" role="3uHU7w">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                 <node concept="1rXfSq" id="1OShD0I6dMx" role="37wK5m">
                   <ref role="37wK5l" node="3OPtF03lcyf" resolve="tail" />
@@ -8206,7 +8206,7 @@
               </node>
               <node concept="3cpWs3" id="3OPtF03lcx_" role="3uHU7B">
                 <node concept="2YIFZM" id="3OPtF03lcxA" role="3uHU7B">
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                   <node concept="1rXfSq" id="1OShD0I6b2n" role="37wK5m">
                     <ref role="37wK5l" node="3OPtF03lcy7" resolve="head" />
@@ -8246,7 +8246,7 @@
                 <ref role="3cqZAo" node="3OPtF03lcxP" resolve="list" />
               </node>
               <node concept="liA8E" id="3OPtF03lcxY" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                 <node concept="1rXfSq" id="3OPtF03lcxZ" role="37wK5m">
                   <ref role="37wK5l" node="3OPtF03lcy7" resolve="head" />
                 </node>
@@ -8601,11 +8601,11 @@
                             <ref role="3cqZAo" node="7XRk2O3vPN3" resolve="logical" />
                           </node>
                           <node concept="liA8E" id="7XRk2O3vREu" role="2OqNvi">
-                            <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                            <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                           </node>
                         </node>
                         <node concept="liA8E" id="7XRk2O3vREv" role="2OqNvi">
-                          <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                          <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                         </node>
                       </node>
                       <node concept="liA8E" id="7XRk2O3vREw" role="2OqNvi">
@@ -8619,7 +8619,7 @@
                     <ref role="3cqZAo" node="7XRk2O3vPN3" resolve="logical" />
                   </node>
                   <node concept="liA8E" id="7XRk2O3vQg4" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                    <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                   </node>
                 </node>
               </node>
@@ -8865,7 +8865,7 @@
                 <ref role="1Px2BO" node="3OPtF03lc$6" resolve="ListNode.Symbols" />
               </node>
               <node concept="2YIFZM" id="1OShD0I2Zo1" role="3uHU7w">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                 <node concept="1rXfSq" id="1OShD0IcIdV" role="37wK5m">
                   <ref role="37wK5l" node="5j6rs$cKt1O" resolve="get" />
@@ -8900,7 +8900,7 @@
                 <ref role="3cqZAo" node="1OShD0I2Zo8" resolve="list" />
               </node>
               <node concept="liA8E" id="1OShD0I2Zoh" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                 <node concept="1rXfSq" id="1OShD0I2Zoi" role="37wK5m">
                   <ref role="37wK5l" node="5j6rs$cKt1O" resolve="get" />
                 </node>
@@ -9124,7 +9124,7 @@
                     <node concept="liA8E" id="3gJBs5s$T2_" role="2OqNvi">
                       <ref role="37wK5l" node="5s497VqYrbO" resolve="append" />
                       <node concept="2YIFZM" id="3gJBs5s$T2A" role="37wK5m">
-                        <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                        <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                         <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                         <node concept="37vLTw" id="3gJBs5s$T4h" role="37wK5m">
                           <ref role="3cqZAo" node="3gJBs5s$T2T" resolve="tbr" />
@@ -9139,7 +9139,7 @@
                   <ref role="3cqZAo" node="3gJBs5s$T2T" resolve="tbr" />
                 </node>
                 <node concept="liA8E" id="3gJBs5s$T2E" role="2OqNvi">
-                  <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind):boolean" resolve="is" />
+                  <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind)" resolve="is" />
                   <node concept="Rm8GO" id="18cJbc0HUZa" role="37wK5m">
                     <ref role="Rm8GQ" to="yt73:~Term$Kind.VAR" resolve="VAR" />
                     <ref role="1Px2BO" to="yt73:~Term$Kind" resolve="Term.Kind" />
@@ -9192,7 +9192,7 @@
               <node concept="3cpWs6" id="6HT7BWBQ6oJ" role="3cqZAp">
                 <node concept="2YIFZM" id="6HT7BWBQ78j" role="3cqZAk">
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                  <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                  <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                   <node concept="Xl_RD" id="6HT7BWBQ7iS" role="37wK5m">
                     <property role="Xl_RC" value="*** Exception during print [%s] ***" />
                   </node>
@@ -9201,7 +9201,7 @@
                       <ref role="3cqZAo" node="6HT7BWBQ4HF" resolve="ex" />
                     </node>
                     <node concept="liA8E" id="6HT7BWBQaSB" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                      <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                     </node>
                   </node>
                 </node>
@@ -9245,7 +9245,7 @@
               <ref role="3cqZAo" node="5s497VqXYms" resolve="sb" />
             </node>
             <node concept="liA8E" id="5s497VqYoT3" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -9305,7 +9305,7 @@
           <node concept="1rXfSq" id="5s497Vr9fV4" role="3clFbG">
             <ref role="37wK5l" node="5s497VqYrbO" resolve="append" />
             <node concept="2YIFZM" id="5s497Vr9fV5" role="37wK5m">
-              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
               <node concept="2OqwBi" id="5NAQwIkrdpK" role="37wK5m">
                 <node concept="37vLTw" id="5NAQwIkrdbj" role="2Oq$k0">
@@ -9343,7 +9343,7 @@
               <ref role="3cqZAo" node="5s497Vr90Ww" resolve="endActions" />
             </node>
             <node concept="liA8E" id="5s497Vrae72" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
               <node concept="Rm8GO" id="5s497VrahFV" role="37wK5m">
                 <ref role="Rm8GQ" node="5s497Vr9kSP" resolve="END_CHILDREN" />
                 <ref role="1Px2BO" node="5s497Vr8LPr" resolve="PrettyPrinter.EndWalk" />
@@ -9393,7 +9393,7 @@
           <node concept="1rXfSq" id="5s497VqYTlW" role="3clFbG">
             <ref role="37wK5l" node="5s497VqYrbO" resolve="append" />
             <node concept="2YIFZM" id="5s497VqYW8H" role="37wK5m">
-              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
               <node concept="2OqwBi" id="5NAQwIkrM9b" role="37wK5m">
                 <node concept="37vLTw" id="5NAQwIkrLix" role="2Oq$k0">
@@ -9490,7 +9490,7 @@
           <node concept="1rXfSq" id="5s497Vr0pa2" role="3clFbG">
             <ref role="37wK5l" node="5s497VqYrbO" resolve="append" />
             <node concept="2YIFZM" id="5s497Vr0pa3" role="37wK5m">
-              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
               <node concept="2OqwBi" id="5NAQwIkrqer" role="37wK5m">
                 <node concept="37vLTw" id="5NAQwIkrpYE" role="2Oq$k0">
@@ -9525,7 +9525,7 @@
               <ref role="3cqZAo" node="5s497Vr90Ww" resolve="endActions" />
             </node>
             <node concept="liA8E" id="5s497Vr9bbf" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
               <node concept="Rm8GO" id="5s497Vr9c7o" role="37wK5m">
                 <ref role="Rm8GQ" node="5s497Vr8Sxa" resolve="END_LIST" />
                 <ref role="1Px2BO" node="5s497Vr8LPr" resolve="PrettyPrinter.EndWalk" />
@@ -9568,7 +9568,7 @@
           <node concept="1rXfSq" id="6_KEUt$WxCa" role="3clFbG">
             <ref role="37wK5l" node="5s497VqYrbO" resolve="append" />
             <node concept="2YIFZM" id="3gJBs5sA4CE" role="37wK5m">
-              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
               <node concept="2OqwBi" id="5NAQwIks1E3" role="37wK5m">
                 <node concept="37vLTw" id="5NAQwIks1p8" role="2Oq$k0">
@@ -9606,7 +9606,7 @@
                 <ref role="3cqZAo" node="5s497Vr90Ww" resolve="endActions" />
               </node>
               <node concept="liA8E" id="5s497Vr968i" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
               </node>
             </node>
             <node concept="liA8E" id="5s497Vr97xI" role="2OqNvi">
@@ -9632,7 +9632,7 @@
               <ref role="3cqZAo" node="5s497VqXYms" resolve="sb" />
             </node>
             <node concept="liA8E" id="5s497VqYtM4" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
               <node concept="37vLTw" id="5s497VqYtPV" role="37wK5m">
                 <ref role="3cqZAo" node="5s497VqYsMT" resolve="s" />
               </node>
@@ -9730,9 +9730,9 @@
                   <ref role="3cqZAo" node="5s497VqXYms" resolve="sb" />
                 </node>
                 <node concept="liA8E" id="5s497VqYOgM" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="2YIFZM" id="5s497VqYOz0" role="37wK5m">
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="37vLTw" id="5s497VqYOS_" role="37wK5m">
                       <ref role="3cqZAo" node="5s497VqYMdj" resolve="o" />
@@ -9787,7 +9787,7 @@
                   <ref role="3cqZAo" node="5s497VqXYms" resolve="sb" />
                 </node>
                 <node concept="liA8E" id="5s497VqXGXT" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="37vLTw" id="5s497Vr13sj" role="37wK5m">
                     <ref role="3cqZAo" node="5s497Vr0Z0K" resolve="indent" />
                   </node>
@@ -10215,7 +10215,7 @@
                 <ref role="3cqZAo" node="6YPNC4PuRfO" resolve="treeForm" />
               </node>
               <node concept="liA8E" id="6YPNC4PuWPp" role="2OqNvi">
-                <ref role="37wK5l" to="yt73:~Term.symbol():java.lang.Object" resolve="symbol" />
+                <ref role="37wK5l" to="yt73:~Term.symbol()" resolve="symbol" />
               </node>
             </node>
           </node>
@@ -10486,7 +10486,7 @@
                   <ref role="3cqZAo" node="3sb6QlvetR9" resolve="run" />
                 </node>
                 <node concept="liA8E" id="3sb6Qlveu50" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Runnable.run():void" resolve="run" />
+                  <ref role="37wK5l" to="wyt6:~Runnable.run()" resolve="run" />
                 </node>
               </node>
             </node>
@@ -10521,14 +10521,14 @@
               <ref role="1PxDUh" node="4peSo3CLajR" resolve="PrintDelegate" />
             </node>
             <node concept="liA8E" id="4peSo3CM95m" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
               <node concept="2OqwBi" id="4peSo3CM9sr" role="37wK5m">
                 <node concept="10M0yZ" id="6r6omRlcouF" role="2Oq$k0">
                   <ref role="3cqZAo" node="4peSo3CLXMD" resolve="DELEGATE" />
                   <ref role="1PxDUh" node="4peSo3CLajR" resolve="PrintDelegate" />
                 </node>
                 <node concept="liA8E" id="4peSo3CM9WK" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~ThreadLocal.get():java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
                 </node>
               </node>
             </node>
@@ -10541,7 +10541,7 @@
               <ref role="1PxDUh" node="4peSo3CLajR" resolve="PrintDelegate" />
             </node>
             <node concept="liA8E" id="4peSo3CMaA0" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object):void" resolve="set" />
+              <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object)" resolve="set" />
               <node concept="37vLTw" id="4peSo3CMaCS" role="37wK5m">
                 <ref role="3cqZAo" node="4peSo3CM30y" resolve="factory" />
               </node>
@@ -10563,14 +10563,14 @@
               <ref role="3cqZAo" node="4peSo3CLXMD" resolve="DELEGATE" />
             </node>
             <node concept="liA8E" id="4peSo3CMbHc" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object):void" resolve="set" />
+              <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object)" resolve="set" />
               <node concept="2OqwBi" id="4peSo3CMce0" role="37wK5m">
                 <node concept="10M0yZ" id="6r6omRlcouI" role="2Oq$k0">
                   <ref role="1PxDUh" node="4peSo3CLajR" resolve="PrintDelegate" />
                   <ref role="3cqZAo" node="4peSo3CM3Qf" resolve="STACK" />
                 </node>
                 <node concept="liA8E" id="4peSo3CMefU" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                  <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
                 </node>
               </node>
             </node>
@@ -10598,7 +10598,7 @@
                 <ref role="3cqZAo" node="4peSo3CLXMD" resolve="DELEGATE" />
               </node>
               <node concept="liA8E" id="4peSo3CM1_m" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~ThreadLocal.get():java.lang.Object" resolve="get" />
+                <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
               </node>
             </node>
             <node concept="liA8E" id="4peSo3CLY$I" role="2OqNvi">
@@ -10951,7 +10951,7 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="4sSe4$pxm8F" role="2OqNvi">
-                          <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind):boolean" resolve="is" />
+                          <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind)" resolve="is" />
                           <node concept="Rm8GO" id="4sSe4$pxm8G" role="37wK5m">
                             <ref role="1Px2BO" to="yt73:~Term$Kind" resolve="Term.Kind" />
                             <ref role="Rm8GQ" to="yt73:~Term$Kind.REF" resolve="REF" />
@@ -11016,7 +11016,7 @@
                               <ref role="3cqZAo" node="6HT7BWBPa9P" resolve="tf" />
                             </node>
                             <node concept="liA8E" id="6HT7BWBRA2_" role="2OqNvi">
-                              <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                              <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
                             </node>
                           </node>
                           <node concept="3uibUv" id="6HT7BWBRA2A" role="10QFUM">
@@ -11404,10 +11404,10 @@
                   <ref role="3cqZAo" node="6YPNC4NZefZ" resolve="sb" />
                 </node>
                 <node concept="liA8E" id="6YPNC4NZeg7" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="2YIFZM" id="6YPNC4NZeg8" role="37wK5m">
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                     <node concept="1rXfSq" id="6YPNC4NZeg9" role="37wK5m">
                       <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
                     </node>
@@ -11415,14 +11415,14 @@
                 </node>
               </node>
               <node concept="liA8E" id="6YPNC4NZega" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="Xl_RD" id="6YPNC4NZegb" role="37wK5m">
                   <property role="Xl_RC" value=":" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="6YPNC4OEnDW" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.Object):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.Object)" resolve="append" />
               <node concept="1rXfSq" id="6YPNC4OEnLd" role="37wK5m">
                 <ref role="37wK5l" node="6YPNC4OE9DW" resolve="argument" />
               </node>
@@ -11435,7 +11435,7 @@
               <ref role="3cqZAo" node="6YPNC4NZefZ" resolve="sb" />
             </node>
             <node concept="liA8E" id="6YPNC4NZhhp" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -11632,7 +11632,7 @@
                   <ref role="3cqZAo" node="6YPNC4NIyLZ" resolve="that" />
                 </node>
                 <node concept="liA8E" id="6YPNC4NINn3" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                 </node>
               </node>
             </node>
@@ -11655,7 +11655,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6YPNC4NIRe6" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                 <node concept="2OqwBi" id="6YPNC4NIRS$" role="37wK5m">
                   <node concept="Xjq3P" id="6YPNC4NIRzy" role="2Oq$k0" />
                   <node concept="2OwXpG" id="6YPNC4NIScZ" role="2OqNvi">
@@ -11689,7 +11689,7 @@
                   <ref role="3cqZAo" node="6YPNC4NIy9J" resolve="name" />
                 </node>
                 <node concept="liA8E" id="6YPNC4NIMym" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.hashCode():int" resolve="hashCode" />
+                  <ref role="37wK5l" to="wyt6:~String.hashCode()" resolve="hashCode" />
                 </node>
               </node>
             </node>
@@ -12039,10 +12039,10 @@
                     <ref role="3cqZAo" node="428_4iYCzIw" resolve="sb" />
                   </node>
                   <node concept="liA8E" id="428_4iYCzIE" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="2YIFZM" id="428_4iYCzIF" role="37wK5m">
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                       <node concept="1rXfSq" id="428_4iYCzIG" role="37wK5m">
                         <ref role="37wK5l" node="1R$Cm9qGRoH" resolve="symbol" />
                       </node>
@@ -12050,21 +12050,21 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="428_4iYCzIH" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="Xl_RD" id="428_4iYCzII" role="37wK5m">
                     <property role="Xl_RC" value="=\&quot;" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="428_4iYCzIJ" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.Object):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.Object)" resolve="append" />
                 <node concept="1rXfSq" id="428_4iYCzIK" role="37wK5m">
                   <ref role="37wK5l" node="6YPNC4OE9DW" resolve="argument" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="428_4iYCzIL" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
               <node concept="Xl_RD" id="428_4iYCzIM" role="37wK5m">
                 <property role="Xl_RC" value="\&quot;" />
               </node>
@@ -12077,7 +12077,7 @@
               <ref role="3cqZAo" node="428_4iYCzIw" resolve="sb" />
             </node>
             <node concept="liA8E" id="428_4iYCzIQ" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
index 7a358cf4..dbf4a8d2 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.predicate.mps
@@ -9,7 +9,7 @@
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="96ee7a94-411d-4cf8-9b94-96cad7e52411" name="jetbrains.mps.baseLanguage.jdk7" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
   </languages>
   <imports>
     <import index="av0y" ref="bbf5c548-7111-4a53-a117-cdefc664cf34/java:jetbrains.mps.logic.reactor.program(jetbrains.mps.logic.reactor/)" />
@@ -316,10 +316,10 @@
       <node concept="3clFbS" id="5uFPQ7BZhBL" role="3clF47">
         <node concept="3clFbF" id="5uFPQ7BZjve" role="3cqZAp">
           <node concept="2YIFZM" id="5uFPQ7BZjxZ" role="3clFbG">
-            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
             <node concept="2YIFZM" id="5uFPQ7BZjDb" role="37wK5m">
-              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
               <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
               <node concept="37vLTw" id="5uFPQ7BZjFA" role="37wK5m">
                 <ref role="3cqZAo" node="5uFPQ7BZe15" resolve="arguments" />
@@ -347,10 +347,10 @@
         <node concept="3clFbF" id="6Kcfpq7B99k" role="3cqZAp">
           <node concept="2OqwBi" id="5uFPQ7BZfDt" role="3clFbG">
             <node concept="1rXfSq" id="7ISVfSJnHs" role="2Oq$k0">
-              <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+              <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
             </node>
             <node concept="liA8E" id="5uFPQ7BZfHQ" role="2OqNvi">
-              <ref role="37wK5l" to="av0y:~PredicateSymbol.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="av0y:~PredicateSymbol.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -399,7 +399,7 @@
               <node concept="2OqwBi" id="6Kcfpq7B2Wo" role="3uHU7B">
                 <node concept="Xjq3P" id="6Kcfpq7B2Wp" role="2Oq$k0" />
                 <node concept="liA8E" id="6Kcfpq7B2Wq" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                 </node>
               </node>
               <node concept="2OqwBi" id="6Kcfpq7B2Wr" role="3uHU7w">
@@ -407,7 +407,7 @@
                   <ref role="3cqZAo" node="6Kcfpq7B2W_" resolve="o" />
                 </node>
                 <node concept="liA8E" id="6Kcfpq7B2Wt" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                 </node>
               </node>
             </node>
@@ -442,13 +442,13 @@
             <node concept="3fqX7Q" id="6Kcfpq7B2WO" role="3K4E3e">
               <node concept="2OqwBi" id="6Kcfpq7B2WP" role="3fr31v">
                 <node concept="liA8E" id="6Kcfpq7B2WQ" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                   <node concept="2OqwBi" id="6Kcfpq7B2WR" role="37wK5m">
                     <node concept="37vLTw" id="6Kcfpq7B2WC" role="2Oq$k0">
                       <ref role="3cqZAo" node="6Kcfpq7B2Ww" resolve="that" />
                     </node>
                     <node concept="liA8E" id="7ISVfSJor9" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -458,7 +458,7 @@
                       <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
                     </node>
                     <node concept="1rXfSq" id="7ISVfSJomP" role="10QFUP">
-                      <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -467,7 +467,7 @@
             <node concept="3y3z36" id="6Kcfpq7B2WV" role="3K4Cdx">
               <node concept="10Nm6u" id="6Kcfpq7B2WW" role="3uHU7w" />
               <node concept="1rXfSq" id="7ISVfSJojN" role="3uHU7B">
-                <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
               </node>
             </node>
             <node concept="3y3z36" id="6Kcfpq7B2WX" role="3K4GZi">
@@ -477,7 +477,7 @@
                   <ref role="3cqZAo" node="6Kcfpq7B2Ww" resolve="that" />
                 </node>
                 <node concept="liA8E" id="7ISVfSJots" role="2OqNvi">
-                  <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                  <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                 </node>
               </node>
             </node>
@@ -537,19 +537,19 @@
                   <node concept="3y3z36" id="6Kcfpq7B2Xt" role="3K4Cdx">
                     <node concept="10Nm6u" id="6Kcfpq7B2Xu" role="3uHU7w" />
                     <node concept="1rXfSq" id="7ISVfSJoxI" role="3uHU7B">
-                      <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="6Kcfpq7B2Xv" role="3K4E3e">
                     <node concept="2YIFZM" id="6Kcfpq7B2Xw" role="2Oq$k0">
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                       <node concept="1rXfSq" id="7ISVfSJoy$" role="37wK5m">
-                        <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="6Kcfpq7B2Xx" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.hashCode():int" resolve="hashCode" />
+                      <ref role="37wK5l" to="wyt6:~String.hashCode()" resolve="hashCode" />
                     </node>
                   </node>
                 </node>
@@ -798,11 +798,11 @@
                     <ref role="3cqZAo" node="2UGjFq4m5q1" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4m8A8" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4m8A9" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="2UGjFq4m8Aa" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -814,11 +814,11 @@
                     <ref role="3cqZAo" node="2UGjFq4m5q1" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4m8Ae" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4m8Af" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="2UGjFq4m8Ag" role="37wK5m">
                     <property role="3cmrfH" value="1" />
                   </node>
@@ -1078,11 +1078,11 @@
                     <ref role="3cqZAo" node="2UGjFq4mhER" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4mjWD" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4mjWE" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="2UGjFq4mjWF" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -1094,11 +1094,11 @@
                     <ref role="3cqZAo" node="2UGjFq4mhER" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4mjWJ" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4mjWK" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="2UGjFq4mjWL" role="37wK5m">
                     <property role="3cmrfH" value="1" />
                   </node>
@@ -1373,7 +1373,7 @@
                       <ref role="3cqZAo" to="yt73:~Unification.INSTANCE" resolve="INSTANCE" />
                     </node>
                     <node concept="liA8E" id="6OkhGGhHPxp" role="2OqNvi">
-                      <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
+                      <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term)" resolve="unify" />
                       <node concept="1eOMI4" id="5TfjU0x$pu8" role="37wK5m">
                         <node concept="10QFUN" id="5TfjU0x$pu5" role="1eOMHV">
                           <node concept="3uibUv" id="5TfjU0x$pua" role="10QFUM">
@@ -1445,7 +1445,7 @@
                       <ref role="3cqZAo" node="7K4Mb_J$cIB" resolve="subs" />
                     </node>
                     <node concept="liA8E" id="6SkxsMzEepC" role="2OqNvi">
-                      <ref role="37wK5l" to="yt73:~Substitution.isSuccessful():boolean" resolve="isSuccessful" />
+                      <ref role="37wK5l" to="yt73:~Substitution.isSuccessful()" resolve="isSuccessful" />
                     </node>
                   </node>
                 </node>
@@ -1464,7 +1464,7 @@
                           <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
                         </node>
                         <node concept="liA8E" id="1Ns6gpY7Sp0" role="2OqNvi">
-                          <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                          <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                         </node>
                       </node>
                     </node>
@@ -1518,7 +1518,7 @@
                                       <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
                                     </node>
                                     <node concept="liA8E" id="6MYr6JwS1$p" role="2OqNvi">
-                                      <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                      <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                     </node>
                                   </node>
                                 </node>
@@ -1533,11 +1533,11 @@
                               <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
                             </node>
                             <node concept="liA8E" id="6SkxsMzFMgY" role="2OqNvi">
-                              <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                              <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                             </node>
                           </node>
                           <node concept="liA8E" id="56MMu0Ap5n2" role="2OqNvi">
-                            <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind):boolean" resolve="is" />
+                            <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind)" resolve="is" />
                             <node concept="Rm8GO" id="573vQv1oO8g" role="37wK5m">
                               <ref role="1Px2BO" to="yt73:~Term$Kind" resolve="Term.Kind" />
                               <ref role="Rm8GQ" to="yt73:~Term$Kind.FUN" resolve="FUN" />
@@ -1551,11 +1551,11 @@
                                 <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
                               </node>
                               <node concept="liA8E" id="6SkxsMzFMD8" role="2OqNvi">
-                                <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                               </node>
                             </node>
                             <node concept="liA8E" id="56MMu0ApUkU" role="2OqNvi">
-                              <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind):boolean" resolve="is" />
+                              <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind)" resolve="is" />
                               <node concept="Rm8GO" id="56MMu0ApUkV" role="37wK5m">
                                 <ref role="1Px2BO" to="yt73:~Term$Kind" resolve="Term.Kind" />
                                 <ref role="Rm8GQ" to="yt73:~Term$Kind.VAR" resolve="VAR" />
@@ -1578,7 +1578,7 @@
                                         <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
                                       </node>
                                       <node concept="liA8E" id="6MYr6JwSbtd" role="2OqNvi">
-                                        <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                        <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                       </node>
                                     </node>
                                   </node>
@@ -1627,7 +1627,7 @@
                                   <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
                                 </node>
                                 <node concept="liA8E" id="3gNap3fZkiL" role="2OqNvi">
-                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                 </node>
                               </node>
                             </node>
@@ -1646,7 +1646,7 @@
                                       <ref role="3cqZAo" node="3gNap3fZiSP" resolve="bvarLogical" />
                                     </node>
                                     <node concept="liA8E" id="3gNap3fZmj7" role="2OqNvi">
-                                      <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                      <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                                     </node>
                                   </node>
                                 </node>
@@ -1668,7 +1668,7 @@
                                             <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
                                           </node>
                                           <node concept="liA8E" id="3gNap3fZlur" role="2OqNvi">
-                                            <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                            <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                           </node>
                                         </node>
                                       </node>
@@ -1698,7 +1698,7 @@
                                                       <ref role="3cqZAo" node="3gNap3fZmj4" resolve="left" />
                                                     </node>
                                                     <node concept="liA8E" id="3gNap3fZqTd" role="2OqNvi">
-                                                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                                                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -1723,7 +1723,7 @@
                                           <ref role="3cqZAo" node="3gNap3fZmj4" resolve="left" />
                                         </node>
                                         <node concept="liA8E" id="3gNap3fZq0K" role="2OqNvi">
-                                          <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                                          <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                                         </node>
                                       </node>
                                     </node>
@@ -1735,7 +1735,7 @@
                                     <ref role="3cqZAo" node="3gNap3fZmj4" resolve="left" />
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZnds" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                                    <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                                   </node>
                                 </node>
                                 <node concept="9aQIb" id="3gNap3fZnen" role="9aQIa">
@@ -1746,7 +1746,7 @@
                                           <ref role="3cqZAo" node="3gNap3fZmj4" resolve="left" />
                                         </node>
                                         <node concept="liA8E" id="3gNap3fZp4c" role="2OqNvi">
-                                          <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                                          <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                                           <node concept="37vLTw" id="3gNap3fZp55" role="37wK5m">
                                             <ref role="3cqZAo" node="3gNap3fZluk" resolve="value" />
                                           </node>
@@ -1765,7 +1765,7 @@
                                 <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
                               </node>
                               <node concept="liA8E" id="3gNap3fZkHV" role="2OqNvi">
-                                <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                               </node>
                             </node>
                           </node>
@@ -1784,7 +1784,7 @@
                                     <ref role="3cqZAo" node="3gNap3fZiSP" resolve="bvarLogical" />
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZrMv" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                                   </node>
                                 </node>
                               </node>
@@ -1808,7 +1808,7 @@
                                           <ref role="3cqZAo" node="6SkxsMzDp28" resolve="bnd" />
                                         </node>
                                         <node concept="liA8E" id="3gNap3fZkUu" role="2OqNvi">
-                                          <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                          <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                         </node>
                                       </node>
                                       <node concept="3uibUv" id="3gNap3g07gl" role="3PaCim">
@@ -1817,7 +1817,7 @@
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZsjf" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                                   </node>
                                 </node>
                               </node>
@@ -1842,7 +1842,7 @@
                                                     <ref role="3cqZAo" node="3gNap3fZrMs" resolve="left" />
                                                   </node>
                                                   <node concept="liA8E" id="3gNap3fZtZb" role="2OqNvi">
-                                                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                                                    <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -1855,7 +1855,7 @@
                                                 <ref role="3cqZAo" node="3gNap3fZkKR" resolve="right" />
                                               </node>
                                               <node concept="liA8E" id="3gNap3fZuQW" role="2OqNvi">
-                                                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                                                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                                               </node>
                                             </node>
                                           </node>
@@ -1872,7 +1872,7 @@
                                         <ref role="3cqZAo" node="3gNap3fZrMs" resolve="left" />
                                       </node>
                                       <node concept="liA8E" id="3gNap3fZtZi" role="2OqNvi">
-                                        <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                                        <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                                       </node>
                                     </node>
                                   </node>
@@ -1885,7 +1885,7 @@
                                     <ref role="3cqZAo" node="3gNap3fZkKR" resolve="right" />
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZtYX" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                                    <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                                   </node>
                                 </node>
                                 <node concept="2OqwBi" id="3gNap3fZsy2" role="3uHU7B">
@@ -1893,7 +1893,7 @@
                                     <ref role="3cqZAo" node="3gNap3fZrMs" resolve="left" />
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZt9V" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                                    <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                                   </node>
                                 </node>
                               </node>
@@ -1905,7 +1905,7 @@
                                         <ref role="3cqZAo" node="3gNap3fZrMs" resolve="left" />
                                       </node>
                                       <node concept="liA8E" id="7fidXgOaBT_" role="2OqNvi">
-                                        <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                                        <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                                         <node concept="37vLTw" id="7fidXgOaBTA" role="37wK5m">
                                           <ref role="3cqZAo" node="3gNap3fZkKR" resolve="right" />
                                         </node>
@@ -1947,7 +1947,7 @@
                     <ref role="3cqZAo" node="7K4Mb_J$cIB" resolve="subs" />
                   </node>
                   <node concept="liA8E" id="6SkxsMzDp2f" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Substitution.bindings():java.util.Collection" resolve="bindings" />
+                    <ref role="37wK5l" to="yt73:~Substitution.bindings()" resolve="bindings" />
                   </node>
                 </node>
               </node>
@@ -2093,7 +2093,7 @@
                   <ref role="3cqZAo" node="4U_yxogBZLE" resolve="left" />
                 </node>
                 <node concept="liA8E" id="6b_Nj5K6khf" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -2127,7 +2127,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="1bm7a6EV5ci" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                    <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                     <node concept="1eOMI4" id="5TfjU0xyP_X" role="37wK5m">
                       <node concept="10QFUN" id="5TfjU0xyP_U" role="1eOMHV">
                         <node concept="16syzq" id="5TfjU0xJFts" role="10QFUM">
@@ -2149,7 +2149,7 @@
                   <ref role="3cqZAo" node="6b_Nj5K6khc" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="5TfjU0xJggS" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
             </node>
@@ -2163,7 +2163,7 @@
                         <ref role="3cqZAo" node="6b_Nj5K6khc" resolve="leftRepr" />
                       </node>
                       <node concept="liA8E" id="5TfjU0xJhdk" role="2OqNvi">
-                        <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                        <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="6SkxsMzEV29" role="37wK5m">
@@ -2218,7 +2218,7 @@
                   <ref role="3cqZAo" node="4U_yxogC05J" resolve="left" />
                 </node>
                 <node concept="liA8E" id="7d$oK1$rAnI" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -2237,7 +2237,7 @@
                   <ref role="3cqZAo" node="4U_yxogC0jU" resolve="right" />
                 </node>
                 <node concept="liA8E" id="7d$oK1$rAnO" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -2266,7 +2266,7 @@
                       <ref role="3cqZAo" node="7d$oK1$rAnE" resolve="leftRepr" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xIiEX" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="5TfjU0xIiEY" role="37wK5m">
@@ -2274,7 +2274,7 @@
                       <ref role="3cqZAo" node="7d$oK1$rAnK" resolve="rightRepr" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xIiF0" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                 </node>
@@ -2287,7 +2287,7 @@
                   <ref role="3cqZAo" node="7d$oK1$rAnK" resolve="rightRepr" />
                 </node>
                 <node concept="liA8E" id="5TfjU0xIiF4" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
               <node concept="2OqwBi" id="5TfjU0xIiF5" role="3uHU7B">
@@ -2295,7 +2295,7 @@
                   <ref role="3cqZAo" node="7d$oK1$rAnE" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="5TfjU0xIiF7" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
             </node>
@@ -2314,7 +2314,7 @@
                       <ref role="3cqZAo" node="7d$oK1$rAnE" resolve="leftRepr" />
                     </node>
                     <node concept="liA8E" id="1POzLwzdIuB" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                 </node>
@@ -2326,7 +2326,7 @@
                 <ref role="3cqZAo" node="7d$oK1$rAnE" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="1POzLwzdIjn" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
             <node concept="3eNFk2" id="1POzLwzdIv$" role="3eNLev">
@@ -2335,7 +2335,7 @@
                   <ref role="3cqZAo" node="7d$oK1$rAnK" resolve="rightRepr" />
                 </node>
                 <node concept="liA8E" id="1POzLwzdIvB" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
               <node concept="3clFbS" id="1POzLwzdIvC" role="3eOfB_">
@@ -2350,7 +2350,7 @@
                         <ref role="3cqZAo" node="7d$oK1$rAnK" resolve="rightRepr" />
                       </node>
                       <node concept="liA8E" id="1POzLwzdIvI" role="2OqNvi">
-                        <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                        <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                       </node>
                     </node>
                   </node>
@@ -2364,7 +2364,7 @@
                 <ref role="3cqZAo" node="7d$oK1$rAnE" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="1POzLwzdIw9" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="37vLTw" id="1POzLwzdIwa" role="37wK5m">
                   <ref role="3cqZAo" node="7d$oK1$rAnK" resolve="rightRepr" />
                 </node>
@@ -2407,7 +2407,7 @@
                   <ref role="3cqZAo" node="1POzLwyWxZf" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="1POzLwyX6pL" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -2425,11 +2425,11 @@
                     <ref role="3cqZAo" node="1POzLwyX6pI" resolve="repr" />
                   </node>
                   <node concept="liA8E" id="1POzLwyWxYh" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.metaLogical():jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="metaLogical" />
+                    <ref role="37wK5l" to="bj13:~Logical.metaLogical()" resolve="metaLogical" />
                   </node>
                 </node>
                 <node concept="liA8E" id="1POzLwyWxYi" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
+                  <ref role="37wK5l" to="bj13:~MetaLogical.type()" resolve="type" />
                 </node>
               </node>
             </node>
@@ -2475,7 +2475,7 @@
                       <ref role="3cqZAo" to="yt73:~Unification.INSTANCE" resolve="INSTANCE" />
                     </node>
                     <node concept="liA8E" id="1POzLwyWxY$" role="2OqNvi">
-                      <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
+                      <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term)" resolve="unify" />
                       <node concept="2ShNRf" id="1POzLwyWxY_" role="37wK5m">
                         <node concept="1pGfFk" id="1POzLwyWxYA" role="2ShVmc">
                           <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
@@ -2543,7 +2543,7 @@
                       <ref role="3cqZAo" node="1POzLwyWxYw" resolve="subs" />
                     </node>
                     <node concept="liA8E" id="1POzLwyWxYZ" role="2OqNvi">
-                      <ref role="37wK5l" to="yt73:~Substitution.isSuccessful():boolean" resolve="isSuccessful" />
+                      <ref role="37wK5l" to="yt73:~Substitution.isSuccessful()" resolve="isSuccessful" />
                     </node>
                   </node>
                 </node>
@@ -2562,7 +2562,7 @@
                   <ref role="3VsUkX" to="yt73:~Term" resolve="Term" />
                 </node>
                 <node concept="liA8E" id="1POzLwyWxZ7" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
+                  <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class)" resolve="isAssignableFrom" />
                   <node concept="37vLTw" id="1POzLwyWxZ8" role="37wK5m">
                     <ref role="3cqZAo" node="1POzLwyWxYb" resolve="cls" />
                   </node>
@@ -2611,7 +2611,7 @@
                       <ref role="3cqZAo" to="yt73:~Unification.INSTANCE" resolve="INSTANCE" />
                     </node>
                     <node concept="liA8E" id="6OkhGGhHV2K" role="2OqNvi">
-                      <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
+                      <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term)" resolve="unify" />
                       <node concept="10QFUN" id="5TfjU0xA2t7" role="37wK5m">
                         <node concept="3uibUv" id="5TfjU0xA2t5" role="10QFUM">
                           <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
@@ -2646,7 +2646,7 @@
                       <ref role="3cqZAo" node="7K4Mb_J$cIV" resolve="subs" />
                     </node>
                     <node concept="liA8E" id="6xYPVrp_rZ_" role="2OqNvi">
-                      <ref role="37wK5l" to="yt73:~Substitution.isSuccessful():boolean" resolve="isSuccessful" />
+                      <ref role="37wK5l" to="yt73:~Substitution.isSuccessful()" resolve="isSuccessful" />
                     </node>
                   </node>
                 </node>
@@ -2676,7 +2676,7 @@
                                     <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
                                   </node>
                                   <node concept="liA8E" id="6xYPVrp_rZY" role="2OqNvi">
-                                    <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                                    <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                                   </node>
                                 </node>
                               </node>
@@ -2686,7 +2686,7 @@
                                 <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
                               </node>
                               <node concept="liA8E" id="6xYPVrp_s02" role="2OqNvi">
-                                <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                               </node>
                             </node>
                           </node>
@@ -2703,7 +2703,7 @@
                             <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
                           </node>
                           <node concept="liA8E" id="7FFmDVAMd63" role="2OqNvi">
-                            <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                            <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                           </node>
                         </node>
                       </node>
@@ -2728,14 +2728,14 @@
                                         <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
                                       </node>
                                       <node concept="liA8E" id="3gNap3g91F2" role="2OqNvi">
-                                        <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                                        <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                               <node concept="liA8E" id="3gNap3fZ_6Y" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                               </node>
                             </node>
                           </node>
@@ -2759,13 +2759,13 @@
                                           <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
                                         </node>
                                         <node concept="liA8E" id="3gNap3fZ_79" role="2OqNvi">
-                                          <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                          <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZ_7a" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                                   </node>
                                 </node>
                               </node>
@@ -2788,7 +2788,7 @@
                                         <ref role="3cqZAo" node="3gNap3fZ_6T" resolve="bndLeft" />
                                       </node>
                                       <node concept="liA8E" id="3gNap3fZHmh" role="2OqNvi">
-                                        <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                                        <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                                       </node>
                                     </node>
                                   </node>
@@ -2800,7 +2800,7 @@
                                     <ref role="3cqZAo" node="3gNap3fZ_70" resolve="bndRight" />
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZAJG" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                                    <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                                   </node>
                                 </node>
                                 <node concept="2OqwBi" id="3gNap3fZ_m6" role="3uHU7B">
@@ -2808,7 +2808,7 @@
                                     <ref role="3cqZAo" node="3gNap3fZ_6T" resolve="bndLeft" />
                                   </node>
                                   <node concept="liA8E" id="3gNap3fZ_Y5" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                                    <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                                   </node>
                                 </node>
                               </node>
@@ -2822,7 +2822,7 @@
                                 <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
                               </node>
                               <node concept="liA8E" id="3gNap3fZ_5H" role="2OqNvi">
-                                <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                               </node>
                             </node>
                           </node>
@@ -2836,7 +2836,7 @@
                                   <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
                                 </node>
                                 <node concept="liA8E" id="3gNap3g91kQ" role="2OqNvi">
-                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                 </node>
                               </node>
                             </node>
@@ -2855,7 +2855,7 @@
                                               <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
                                             </node>
                                             <node concept="liA8E" id="3gNap3g94c0" role="2OqNvi">
-                                              <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                              <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                             </node>
                                           </node>
                                         </node>
@@ -2869,7 +2869,7 @@
                                         <ref role="3cqZAo" node="3gNap3fZ_6T" resolve="bndLeft" />
                                       </node>
                                       <node concept="liA8E" id="3gNap3g945W" role="2OqNvi">
-                                        <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                                        <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                                       </node>
                                     </node>
                                   </node>
@@ -2878,7 +2878,7 @@
                                       <ref role="3cqZAo" node="3gNap3fZ_6T" resolve="bndLeft" />
                                     </node>
                                     <node concept="liA8E" id="3gNap3g93IL" role="2OqNvi">
-                                      <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                                      <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                                     </node>
                                   </node>
                                 </node>
@@ -2899,7 +2899,7 @@
                             <ref role="3cqZAo" node="6xYPVrp_s03" resolve="bnd" />
                           </node>
                           <node concept="liA8E" id="3gNap3fZzxU" role="2OqNvi">
-                            <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                            <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                           </node>
                         </node>
                       </node>
@@ -2917,7 +2917,7 @@
                     <ref role="3cqZAo" node="7K4Mb_J$cIV" resolve="subs" />
                   </node>
                   <node concept="liA8E" id="6xYPVrp_s07" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Substitution.bindings():java.util.Collection" resolve="bindings" />
+                    <ref role="37wK5l" to="yt73:~Substitution.bindings()" resolve="bindings" />
                   </node>
                 </node>
               </node>
@@ -3052,17 +3052,17 @@
                               <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
                             </node>
                             <node concept="liA8E" id="5TfjU0xJFH9" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                             </node>
                           </node>
                         </node>
                         <node concept="liA8E" id="5TfjU0xCkrQ" role="2OqNvi">
-                          <ref role="37wK5l" to="bj13:~Logical.metaLogical():jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="metaLogical" />
+                          <ref role="37wK5l" to="bj13:~Logical.metaLogical()" resolve="metaLogical" />
                         </node>
                       </node>
                     </node>
                     <node concept="liA8E" id="5TfjU0xCkrR" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
+                      <ref role="37wK5l" to="bj13:~MetaLogical.type()" resolve="type" />
                     </node>
                   </node>
                 </node>
@@ -3085,7 +3085,7 @@
                               <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
                             </node>
                             <node concept="liA8E" id="5TfjU0xJFHd" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                             </node>
                           </node>
                         </node>
@@ -3115,7 +3115,7 @@
                           <ref role="3cqZAo" to="yt73:~Unification.INSTANCE" resolve="INSTANCE" />
                         </node>
                         <node concept="liA8E" id="5TfjU0xCks9" role="2OqNvi">
-                          <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
+                          <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term)" resolve="unify" />
                           <node concept="2ShNRf" id="5TfjU0xCksa" role="37wK5m">
                             <node concept="1pGfFk" id="5TfjU0xCksb" role="2ShVmc">
                               <ref role="37wK5l" to="oy3s:4TCblo5ML4I" resolve="LogicalDataForm" />
@@ -3148,7 +3148,7 @@
                           <ref role="3cqZAo" node="5TfjU0xCks5" resolve="subs" />
                         </node>
                         <node concept="liA8E" id="5TfjU0xCks$" role="2OqNvi">
-                          <ref role="37wK5l" to="yt73:~Substitution.isSuccessful():boolean" resolve="isSuccessful" />
+                          <ref role="37wK5l" to="yt73:~Substitution.isSuccessful()" resolve="isSuccessful" />
                         </node>
                       </node>
                     </node>
@@ -3166,7 +3166,7 @@
                               <ref role="3cqZAo" node="5TfjU0xHlrK" resolve="bnd" />
                             </node>
                             <node concept="liA8E" id="5TfjU0xHlrm" role="2OqNvi">
-                              <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                              <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                             </node>
                           </node>
                           <node concept="1eOMI4" id="5TfjU0xJFHq" role="3uHU7w">
@@ -3175,7 +3175,7 @@
                                 <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
                               </node>
                               <node concept="liA8E" id="5TfjU0xJFHp" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                               </node>
                             </node>
                           </node>
@@ -3204,7 +3204,7 @@
                                         <ref role="3cqZAo" node="5TfjU0xHlrK" resolve="bnd" />
                                       </node>
                                       <node concept="liA8E" id="5TfjU0xHlrA" role="2OqNvi">
-                                        <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                                        <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                                       </node>
                                     </node>
                                   </node>
@@ -3214,7 +3214,7 @@
                                     <ref role="3cqZAo" node="5TfjU0xHlrK" resolve="bnd" />
                                   </node>
                                   <node concept="liA8E" id="5TfjU0xHlrD" role="2OqNvi">
-                                    <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                    <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                   </node>
                                 </node>
                               </node>
@@ -3231,7 +3231,7 @@
                                 <ref role="3cqZAo" node="5TfjU0xHlrK" resolve="bnd" />
                               </node>
                               <node concept="liA8E" id="5TfjU0xHlrJ" role="2OqNvi">
-                                <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                                <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                               </node>
                             </node>
                           </node>
@@ -3256,14 +3256,14 @@
                                             <ref role="3cqZAo" node="5TfjU0xHlrK" resolve="bnd" />
                                           </node>
                                           <node concept="liA8E" id="5TfjU0xHMH9" role="2OqNvi">
-                                            <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                                            <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                                           </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="5TfjU0xHMHa" role="2OqNvi">
-                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                    <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                                   </node>
                                 </node>
                               </node>
@@ -3287,13 +3287,13 @@
                                               <ref role="3cqZAo" node="5TfjU0xHlrK" resolve="bnd" />
                                             </node>
                                             <node concept="liA8E" id="5TfjU0xHMHn" role="2OqNvi">
-                                              <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                              <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="5TfjU0xHMHo" role="2OqNvi">
-                                        <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                        <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                                       </node>
                                     </node>
                                   </node>
@@ -3316,7 +3316,7 @@
                                             <ref role="3cqZAo" node="5TfjU0xHMGZ" resolve="bndLeft" />
                                           </node>
                                           <node concept="liA8E" id="5TfjU0xHMH$" role="2OqNvi">
-                                            <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                                            <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                                           </node>
                                         </node>
                                       </node>
@@ -3328,7 +3328,7 @@
                                         <ref role="3cqZAo" node="5TfjU0xHMHe" resolve="bndRight" />
                                       </node>
                                       <node concept="liA8E" id="5TfjU0xHMHC" role="2OqNvi">
-                                        <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                                        <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                                       </node>
                                     </node>
                                     <node concept="2OqwBi" id="5TfjU0xHMHD" role="3uHU7B">
@@ -3336,7 +3336,7 @@
                                         <ref role="3cqZAo" node="5TfjU0xHMGZ" resolve="bndLeft" />
                                       </node>
                                       <node concept="liA8E" id="5TfjU0xHMHF" role="2OqNvi">
-                                        <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                                        <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                                       </node>
                                     </node>
                                   </node>
@@ -3350,7 +3350,7 @@
                                     <ref role="3cqZAo" node="5TfjU0xHlrK" resolve="bnd" />
                                   </node>
                                   <node concept="liA8E" id="5TfjU0xHMHK" role="2OqNvi">
-                                    <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                    <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                   </node>
                                 </node>
                               </node>
@@ -3364,7 +3364,7 @@
                                       <ref role="3cqZAo" node="5TfjU0xHlrK" resolve="bnd" />
                                     </node>
                                     <node concept="liA8E" id="5TfjU0xHMHQ" role="2OqNvi">
-                                      <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                      <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                     </node>
                                   </node>
                                 </node>
@@ -3383,7 +3383,7 @@
                                                   <ref role="3cqZAo" node="5TfjU0xHlrK" resolve="bnd" />
                                                 </node>
                                                 <node concept="liA8E" id="5TfjU0xHMI1" role="2OqNvi">
-                                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                                 </node>
                                               </node>
                                             </node>
@@ -3397,7 +3397,7 @@
                                             <ref role="3cqZAo" node="5TfjU0xHMGZ" resolve="bndLeft" />
                                           </node>
                                           <node concept="liA8E" id="5TfjU0xHMI5" role="2OqNvi">
-                                            <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                                            <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                                           </node>
                                         </node>
                                       </node>
@@ -3406,7 +3406,7 @@
                                           <ref role="3cqZAo" node="5TfjU0xHMGZ" resolve="bndLeft" />
                                         </node>
                                         <node concept="liA8E" id="5TfjU0xHMI8" role="2OqNvi">
-                                          <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                                          <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                                         </node>
                                       </node>
                                     </node>
@@ -3427,7 +3427,7 @@
                                 <ref role="3cqZAo" node="5TfjU0xHlrK" resolve="bnd" />
                               </node>
                               <node concept="liA8E" id="5TfjU0xHMIf" role="2OqNvi">
-                                <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                                <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                               </node>
                             </node>
                           </node>
@@ -3445,7 +3445,7 @@
                         <ref role="3cqZAo" node="5TfjU0xCks5" resolve="subs" />
                       </node>
                       <node concept="liA8E" id="5TfjU0xHlrO" role="2OqNvi">
-                        <ref role="37wK5l" to="yt73:~Substitution.bindings():java.util.Collection" resolve="bindings" />
+                        <ref role="37wK5l" to="yt73:~Substitution.bindings()" resolve="bindings" />
                       </node>
                     </node>
                   </node>
@@ -3462,7 +3462,7 @@
                       <ref role="3VsUkX" to="yt73:~Term" resolve="Term" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xCksG" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
+                      <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class)" resolve="isAssignableFrom" />
                       <node concept="37vLTw" id="5TfjU0xCksH" role="37wK5m">
                         <ref role="3cqZAo" node="5TfjU0xCkrJ" resolve="cls" />
                       </node>
@@ -3487,12 +3487,12 @@
                       <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xJFHh" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                      <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                     </node>
                   </node>
                 </node>
                 <node concept="liA8E" id="4U_yxogDnOx" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                 </node>
               </node>
             </node>
@@ -3508,12 +3508,12 @@
                             <ref role="3cqZAo" node="4U_yxogC1Ek" resolve="left" />
                           </node>
                           <node concept="liA8E" id="5TfjU0xJFHl" role="2OqNvi">
-                            <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                            <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                           </node>
                         </node>
                       </node>
                       <node concept="liA8E" id="5TfjU0xCZYL" role="2OqNvi">
-                        <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                        <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="5TfjU0xD3yM" role="37wK5m">
@@ -3574,7 +3574,7 @@
                   <ref role="3cqZAo" node="4U_yxogC2zy" resolve="left" />
                 </node>
                 <node concept="liA8E" id="7d$oK1$nL7J" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -3593,7 +3593,7 @@
                   <ref role="3cqZAo" node="4U_yxogC2z$" resolve="right" />
                 </node>
                 <node concept="liA8E" id="7d$oK1$nLDR" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -3626,7 +3626,7 @@
                       <ref role="3cqZAo" node="7d$oK1$nL7F" resolve="leftRepr" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xFiJ$" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="5TfjU0xFrQi" role="37wK5m">
@@ -3634,7 +3634,7 @@
                       <ref role="3cqZAo" node="7d$oK1$nLDN" resolve="rightRepr" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xFufg" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                 </node>
@@ -3646,7 +3646,7 @@
                   <ref role="3cqZAo" node="7d$oK1$nLDN" resolve="rightRepr" />
                 </node>
                 <node concept="liA8E" id="5TfjU0xF5pB" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
               <node concept="2OqwBi" id="5TfjU0xF0Tt" role="3uHU7B">
@@ -3654,7 +3654,7 @@
                   <ref role="3cqZAo" node="7d$oK1$nL7F" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="5TfjU0xF2Pc" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
             </node>
@@ -3669,7 +3669,7 @@
                       <ref role="3cqZAo" node="7d$oK1$nL7F" resolve="leftRepr" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xGuDg" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="5TfjU0xGyXd" role="37wK5m">
@@ -3683,7 +3683,7 @@
                 <ref role="3cqZAo" node="7d$oK1$nL7F" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="5TfjU0xFYlu" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3700,7 +3700,7 @@
                       <ref role="3cqZAo" node="7d$oK1$nLDN" resolve="rightRepr" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xGRAT" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                 </node>
@@ -3711,7 +3711,7 @@
                 <ref role="3cqZAo" node="7d$oK1$nLDN" resolve="rightRepr" />
               </node>
               <node concept="liA8E" id="5TfjU0xGAre" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -3764,7 +3764,7 @@
                   <ref role="3cqZAo" node="6xYPVrp_1P$" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="6MYr6Jy8_cI" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
             </node>
@@ -3804,7 +3804,7 @@
                 <ref role="3cqZAo" node="6xYPVrp_37O" resolve="bound" />
               </node>
               <node concept="liA8E" id="2T1p0CFz6aA" role="2OqNvi">
-                <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind):boolean" resolve="is" />
+                <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind)" resolve="is" />
                 <node concept="Rm8GO" id="2T1p0CFz6aB" role="37wK5m">
                   <ref role="1Px2BO" to="yt73:~Term$Kind" resolve="Term.Kind" />
                   <ref role="Rm8GQ" to="yt73:~Term$Kind.FUN" resolve="FUN" />
@@ -3845,7 +3845,7 @@
                   <ref role="3cqZAo" node="6xYPVrp_37O" resolve="bound" />
                 </node>
                 <node concept="liA8E" id="2T1p0CFz6aR" role="2OqNvi">
-                  <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind):boolean" resolve="is" />
+                  <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind)" resolve="is" />
                   <node concept="Rm8GO" id="2T1p0CFz6aS" role="37wK5m">
                     <ref role="1Px2BO" to="yt73:~Term$Kind" resolve="Term.Kind" />
                     <ref role="Rm8GQ" to="yt73:~Term$Kind.VAR" resolve="VAR" />
@@ -3909,11 +3909,11 @@
                     <ref role="3cqZAo" node="1MWQR5SpMLu" resolve="subs" />
                   </node>
                   <node concept="liA8E" id="1MWQR5SpML5" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Substitution.failureCause():jetbrains.mps.unification.Substitution$FailureCause" resolve="failureCause" />
+                    <ref role="37wK5l" to="yt73:~Substitution.failureCause()" resolve="failureCause" />
                   </node>
                 </node>
                 <node concept="liA8E" id="1MWQR5SpML6" role="2OqNvi">
-                  <ref role="37wK5l" to="yt73:~Substitution$FailureCause.toString():java.lang.String" resolve="toString" />
+                  <ref role="37wK5l" to="yt73:~Substitution$FailureCause.toString()" resolve="toString" />
                 </node>
               </node>
             </node>
@@ -3924,7 +3924,7 @@
                 <node concept="37vLTI" id="1MWQR5SpMLa" role="3clFbG">
                   <node concept="2YIFZM" id="1MWQR5SpMLb" role="37vLTx">
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                     <node concept="Xl_RD" id="1MWQR5SpMLc" role="37wK5m">
                       <property role="Xl_RC" value="'%s' != '%s'" />
                     </node>
@@ -3933,7 +3933,7 @@
                         <ref role="3cqZAo" node="1MWQR5SpMLu" resolve="subs" />
                       </node>
                       <node concept="liA8E" id="1MWQR5SpMLf" role="2OqNvi">
-                        <ref role="37wK5l" to="yt73:~Substitution.failureDetails():java.lang.Object[]" resolve="failureDetails" />
+                        <ref role="37wK5l" to="yt73:~Substitution.failureDetails()" resolve="failureDetails" />
                       </node>
                     </node>
                   </node>
@@ -3954,7 +3954,7 @@
                     <ref role="3cqZAo" node="1MWQR5SpMLu" resolve="subs" />
                   </node>
                   <node concept="liA8E" id="1MWQR5SpMLm" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Substitution.failureCause():jetbrains.mps.unification.Substitution$FailureCause" resolve="failureCause" />
+                    <ref role="37wK5l" to="yt73:~Substitution.failureCause()" resolve="failureCause" />
                   </node>
                 </node>
               </node>
@@ -3965,7 +3965,7 @@
                     <ref role="3cqZAo" node="1MWQR5SpMLu" resolve="subs" />
                   </node>
                   <node concept="liA8E" id="1MWQR5SpMLr" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Substitution.failureDetails():java.lang.Object[]" resolve="failureDetails" />
+                    <ref role="37wK5l" to="yt73:~Substitution.failureDetails()" resolve="failureDetails" />
                   </node>
                 </node>
               </node>
@@ -4411,11 +4411,11 @@
                     <ref role="3cqZAo" node="2UGjFq4l$TZ" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4l_wR" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4l_Rj" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="2UGjFq4l_Ux" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -4532,11 +4532,11 @@
                     <ref role="3cqZAo" node="2UGjFq4kzkN" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4lzR8" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4lzR9" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="2UGjFq4lzRa" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -4699,7 +4699,7 @@
                   <ref role="3cqZAo" node="6infEALAKQI" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="6infEALBcls" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -4724,7 +4724,7 @@
                     <ref role="3cqZAo" node="6infEALBcln" resolve="repr" />
                   </node>
                   <node concept="liA8E" id="6infEALBgCV" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                   </node>
                 </node>
               </node>
@@ -4733,7 +4733,7 @@
                   <ref role="3cqZAo" node="6infEALBcln" resolve="repr" />
                 </node>
                 <node concept="liA8E" id="6infEALBeBH" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
             </node>
@@ -4750,7 +4750,7 @@
                   <ref role="3cqZAo" node="6infEALBcln" resolve="repr" />
                 </node>
                 <node concept="liA8E" id="6infEALBscr" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                 </node>
               </node>
             </node>
@@ -4763,7 +4763,7 @@
                     <ref role="3cqZAo" node="6infEALBcln" resolve="repr" />
                   </node>
                   <node concept="liA8E" id="6infEALBvmp" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                    <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                     <node concept="10M0yZ" id="6infEALBvoZ" role="37wK5m">
                       <ref role="3cqZAo" to="wyt6:~Boolean.TRUE" resolve="TRUE" />
                       <ref role="1PxDUh" to="wyt6:~Boolean" resolve="Boolean" />
@@ -4831,7 +4831,7 @@
                   <ref role="3cqZAo" node="6infEALAKR3" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="6infEALBa$D" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -4850,7 +4850,7 @@
                   <ref role="3cqZAo" node="6infEALBa$A" resolve="repr" />
                 </node>
                 <node concept="liA8E" id="6infEALB0GT" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
             </node>
@@ -4862,7 +4862,7 @@
                 <ref role="3cqZAo" node="6infEALBa$A" resolve="repr" />
               </node>
               <node concept="liA8E" id="6infEALAXgk" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
           </node>
@@ -5086,11 +5086,11 @@
                     <ref role="3cqZAo" node="2UGjFq4lDR6" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4lFoe" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4lFof" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="2UGjFq4lFog" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -5102,11 +5102,11 @@
                     <ref role="3cqZAo" node="2UGjFq4lDR6" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4lFMe" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4lFMf" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="2UGjFq4lFMg" role="37wK5m">
                     <property role="3cmrfH" value="1" />
                   </node>
@@ -5379,11 +5379,11 @@
                     <ref role="3cqZAo" node="2UGjFq4lKkm" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4lNPx" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4lNPy" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="2UGjFq4lNPz" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -5395,11 +5395,11 @@
                     <ref role="3cqZAo" node="2UGjFq4lKkm" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="2UGjFq4lNPB" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="2UGjFq4lNPC" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="2UGjFq4lNPD" role="37wK5m">
                     <property role="3cmrfH" value="1" />
                   </node>
@@ -5658,7 +5658,7 @@
                       <ref role="1PxDUh" to="yt73:~Unification" resolve="Unification" />
                     </node>
                     <node concept="liA8E" id="390NiL16yeb" role="2OqNvi">
-                      <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
+                      <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term)" resolve="unify" />
                       <node concept="1eOMI4" id="390NiL16yec" role="37wK5m">
                         <node concept="10QFUN" id="390NiL16yed" role="1eOMHV">
                           <node concept="3uibUv" id="390NiL16yee" role="10QFUM">
@@ -5730,7 +5730,7 @@
                       <ref role="3cqZAo" node="390NiL16ye7" resolve="subs" />
                     </node>
                     <node concept="liA8E" id="390NiL16yeC" role="2OqNvi">
-                      <ref role="37wK5l" to="yt73:~Substitution.isSuccessful():boolean" resolve="isSuccessful" />
+                      <ref role="37wK5l" to="yt73:~Substitution.isSuccessful()" resolve="isSuccessful" />
                     </node>
                   </node>
                 </node>
@@ -5758,7 +5758,7 @@
                                   <ref role="3cqZAo" node="6SwZmzBBWe4" resolve="bnd" />
                                 </node>
                                 <node concept="liA8E" id="6SwZmzBC0kj" role="2OqNvi">
-                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                                 </node>
                               </node>
                             </node>
@@ -5783,7 +5783,7 @@
                                   <ref role="3cqZAo" node="6SwZmzBBWe4" resolve="bnd" />
                                 </node>
                                 <node concept="liA8E" id="6SwZmzBCqdI" role="2OqNvi">
-                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                 </node>
                               </node>
                             </node>
@@ -5805,7 +5805,7 @@
                               <ref role="3cqZAo" node="6SwZmzBCqdA" resolve="tLogical" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBCwD7" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                             </node>
                           </node>
                           <node concept="2OqwBi" id="6SwZmzBCs5M" role="3uHU7B">
@@ -5813,7 +5813,7 @@
                               <ref role="3cqZAo" node="6SwZmzBBYus" resolve="vLogical" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBCtkA" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                             </node>
                           </node>
                         </node>
@@ -5827,7 +5827,7 @@
                             <ref role="3cqZAo" node="6SwZmzBBWe4" resolve="bnd" />
                           </node>
                           <node concept="liA8E" id="6SwZmzBCq7Y" role="2OqNvi">
-                            <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                            <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                           </node>
                         </node>
                       </node>
@@ -5838,7 +5838,7 @@
                             <ref role="3cqZAo" node="6SwZmzBBWe4" resolve="bnd" />
                           </node>
                           <node concept="liA8E" id="6SwZmzBCphD" role="2OqNvi">
-                            <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                            <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                           </node>
                         </node>
                       </node>
@@ -5852,7 +5852,7 @@
                               <ref role="3cqZAo" node="6SwZmzBBWe4" resolve="bnd" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBGn_m" role="2OqNvi">
-                              <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                              <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                             </node>
                           </node>
                         </node>
@@ -5863,7 +5863,7 @@
                               <ref role="3cqZAo" node="6SwZmzBBWe4" resolve="bnd" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBGn_q" role="2OqNvi">
-                              <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                              <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                             </node>
                           </node>
                         </node>
@@ -5883,7 +5883,7 @@
                                   <ref role="3cqZAo" node="6SwZmzBBWe4" resolve="bnd" />
                                 </node>
                                 <node concept="liA8E" id="6SwZmzBGn_z" role="2OqNvi">
-                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                                 </node>
                               </node>
                             </node>
@@ -5903,7 +5903,7 @@
                                   <ref role="3cqZAo" node="6SwZmzBBWe4" resolve="bnd" />
                                 </node>
                                 <node concept="liA8E" id="6SwZmzBGn_F" role="2OqNvi">
-                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                 </node>
                               </node>
                             </node>
@@ -5924,7 +5924,7 @@
                                 <ref role="3cqZAo" node="6SwZmzBGn__" resolve="tLogical" />
                               </node>
                               <node concept="liA8E" id="6SwZmzBGn_O" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                               </node>
                             </node>
                             <node concept="2OqwBi" id="6SwZmzBGn_P" role="3uHU7B">
@@ -5932,7 +5932,7 @@
                                 <ref role="3cqZAo" node="6SwZmzBGn_t" resolve="vLogical" />
                               </node>
                               <node concept="liA8E" id="6SwZmzBGn_R" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                               </node>
                             </node>
                           </node>
@@ -5983,7 +5983,7 @@
                     <ref role="3cqZAo" node="390NiL16ye7" resolve="subs" />
                   </node>
                   <node concept="liA8E" id="6SwZmzBBWeb" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Substitution.bindings():java.util.Collection" resolve="bindings" />
+                    <ref role="37wK5l" to="yt73:~Substitution.bindings()" resolve="bindings" />
                   </node>
                 </node>
               </node>
@@ -6128,7 +6128,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4V_C" resolve="left" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn77Z0" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6145,7 +6145,7 @@
                   <ref role="3cqZAo" node="3HJTsBn77YW" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn77Zn" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                 </node>
               </node>
             </node>
@@ -6264,7 +6264,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4V_R" resolve="left" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn6R7_" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6283,7 +6283,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4V_U" resolve="right" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn6R7F" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6318,7 +6318,7 @@
                       <ref role="3cqZAo" node="3HJTsBn6R7x" resolve="leftRepr" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xlJO3" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="5TfjU0xlKvG" role="37wK5m">
@@ -6326,7 +6326,7 @@
                       <ref role="3cqZAo" node="3HJTsBn6R7B" resolve="rightRepr" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xlKQD" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                 </node>
@@ -6339,7 +6339,7 @@
                   <ref role="3cqZAo" node="3HJTsBn6R7B" resolve="rightRepr" />
                 </node>
                 <node concept="liA8E" id="5TfjU0xlIZU" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
               <node concept="2OqwBi" id="5TfjU0xlHGF" role="3uHU7B">
@@ -6347,7 +6347,7 @@
                   <ref role="3cqZAo" node="3HJTsBn6R7x" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="5TfjU0xlI96" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
             </node>
@@ -6420,7 +6420,7 @@
                       <ref role="1PxDUh" to="yt73:~Unification" resolve="Unification" />
                     </node>
                     <node concept="liA8E" id="390NiL16_Ib" role="2OqNvi">
-                      <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term):jetbrains.mps.unification.Substitution" resolve="unify" />
+                      <ref role="37wK5l" to="yt73:~Unification.unify(jetbrains.mps.unification.Term,jetbrains.mps.unification.Term)" resolve="unify" />
                       <node concept="10QFUN" id="390NiL16_Ic" role="37wK5m">
                         <node concept="3uibUv" id="390NiL16_Id" role="10QFUM">
                           <ref role="3uigEE" to="yt73:~Term" resolve="Term" />
@@ -6455,7 +6455,7 @@
                       <ref role="3cqZAo" node="390NiL16_I7" resolve="subs" />
                     </node>
                     <node concept="liA8E" id="390NiL16_Ip" role="2OqNvi">
-                      <ref role="37wK5l" to="yt73:~Substitution.isSuccessful():boolean" resolve="isSuccessful" />
+                      <ref role="37wK5l" to="yt73:~Substitution.isSuccessful()" resolve="isSuccessful" />
                     </node>
                   </node>
                 </node>
@@ -6483,7 +6483,7 @@
                                   <ref role="3cqZAo" node="6SwZmzBD5B9" resolve="bnd" />
                                 </node>
                                 <node concept="liA8E" id="6SwZmzBD5At" role="2OqNvi">
-                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                                 </node>
                               </node>
                             </node>
@@ -6508,7 +6508,7 @@
                                   <ref role="3cqZAo" node="6SwZmzBD5B9" resolve="bnd" />
                                 </node>
                                 <node concept="liA8E" id="6SwZmzBD5AB" role="2OqNvi">
-                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                 </node>
                               </node>
                             </node>
@@ -6530,7 +6530,7 @@
                               <ref role="3cqZAo" node="6SwZmzBD5Av" resolve="tLogical" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBD5AK" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                             </node>
                           </node>
                           <node concept="2OqwBi" id="6SwZmzBD5AL" role="3uHU7B">
@@ -6538,7 +6538,7 @@
                               <ref role="3cqZAo" node="6SwZmzBD5Al" resolve="vLogical" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBD5AN" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                             </node>
                           </node>
                         </node>
@@ -6552,7 +6552,7 @@
                             <ref role="3cqZAo" node="6SwZmzBD5B9" resolve="bnd" />
                           </node>
                           <node concept="liA8E" id="6SwZmzBD5AS" role="2OqNvi">
-                            <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                            <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                           </node>
                         </node>
                       </node>
@@ -6563,7 +6563,7 @@
                             <ref role="3cqZAo" node="6SwZmzBD5B9" resolve="bnd" />
                           </node>
                           <node concept="liA8E" id="6SwZmzBD5AW" role="2OqNvi">
-                            <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                            <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                           </node>
                         </node>
                       </node>
@@ -6577,7 +6577,7 @@
                               <ref role="3cqZAo" node="6SwZmzBD5B9" resolve="bnd" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBGanM" role="2OqNvi">
-                              <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                              <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                             </node>
                           </node>
                         </node>
@@ -6588,7 +6588,7 @@
                               <ref role="3cqZAo" node="6SwZmzBD5B9" resolve="bnd" />
                             </node>
                             <node concept="liA8E" id="6SwZmzBG9s2" role="2OqNvi">
-                              <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                              <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                             </node>
                           </node>
                         </node>
@@ -6608,7 +6608,7 @@
                                   <ref role="3cqZAo" node="6SwZmzBD5B9" resolve="bnd" />
                                 </node>
                                 <node concept="liA8E" id="6SwZmzBGbc2" role="2OqNvi">
-                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.var():jetbrains.mps.unification.Term" resolve="var" />
+                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.var()" resolve="var" />
                                 </node>
                               </node>
                             </node>
@@ -6628,7 +6628,7 @@
                                   <ref role="3cqZAo" node="6SwZmzBD5B9" resolve="bnd" />
                                 </node>
                                 <node concept="liA8E" id="6SwZmzBGfdT" role="2OqNvi">
-                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term():jetbrains.mps.unification.Term" resolve="term" />
+                                  <ref role="37wK5l" to="yt73:~Substitution$Binding.term()" resolve="term" />
                                 </node>
                               </node>
                             </node>
@@ -6649,7 +6649,7 @@
                                 <ref role="3cqZAo" node="6SwZmzBGfdN" resolve="tLogical" />
                               </node>
                               <node concept="liA8E" id="6SwZmzBGgQ$" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                               </node>
                             </node>
                             <node concept="2OqwBi" id="6SwZmzBGgQ_" role="3uHU7B">
@@ -6657,7 +6657,7 @@
                                 <ref role="3cqZAo" node="6SwZmzBGbbY" resolve="vLogical" />
                               </node>
                               <node concept="liA8E" id="6SwZmzBGgQB" role="2OqNvi">
-                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                               </node>
                             </node>
                           </node>
@@ -6680,7 +6680,7 @@
                     <ref role="3cqZAo" node="390NiL16_I7" resolve="subs" />
                   </node>
                   <node concept="liA8E" id="6SwZmzBD5Bd" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Substitution.bindings():java.util.Collection" resolve="bindings" />
+                    <ref role="37wK5l" to="yt73:~Substitution.bindings()" resolve="bindings" />
                   </node>
                 </node>
               </node>
@@ -6804,7 +6804,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4VAC" resolve="left" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn6Eho" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6821,7 +6821,7 @@
                   <ref role="3cqZAo" node="3HJTsBn6Ehk" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="390NiL16DNr" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                 </node>
               </node>
             </node>
@@ -6900,7 +6900,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4VAT" resolve="left" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn61Rv" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6919,7 +6919,7 @@
                   <ref role="3cqZAo" node="3HJTsBn4VAW" resolve="right" />
                 </node>
                 <node concept="liA8E" id="3HJTsBn61R_" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
             </node>
@@ -6958,7 +6958,7 @@
                       <ref role="3cqZAo" node="3HJTsBn61Rr" resolve="leftRepr" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xmaKZ" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="5TfjU0xmdeJ" role="37wK5m">
@@ -6966,7 +6966,7 @@
                       <ref role="3cqZAo" node="3HJTsBn61Rx" resolve="rightRepr" />
                     </node>
                     <node concept="liA8E" id="5TfjU0xmdxZ" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                 </node>
@@ -6978,7 +6978,7 @@
                   <ref role="3cqZAo" node="3HJTsBn61Rx" resolve="rightRepr" />
                 </node>
                 <node concept="liA8E" id="5TfjU0xm7bx" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
               <node concept="2OqwBi" id="5TfjU0xm4Bq" role="3uHU7B">
@@ -6986,7 +6986,7 @@
                   <ref role="3cqZAo" node="3HJTsBn61Rr" resolve="leftRepr" />
                 </node>
                 <node concept="liA8E" id="5TfjU0xm5Ho" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
             </node>
@@ -7001,7 +7001,7 @@
                       <ref role="3cqZAo" node="3HJTsBn61Rr" resolve="leftRepr" />
                     </node>
                     <node concept="liA8E" id="390NiL16Gtl" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="390NiL16Gv0" role="37wK5m">
@@ -7015,7 +7015,7 @@
                 <ref role="3cqZAo" node="3HJTsBn61Rr" resolve="leftRepr" />
               </node>
               <node concept="liA8E" id="390NiL16Fxn" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -7032,7 +7032,7 @@
                       <ref role="3cqZAo" node="3HJTsBn61Rx" resolve="rightRepr" />
                     </node>
                     <node concept="liA8E" id="390NiL16IAw" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                 </node>
@@ -7043,7 +7043,7 @@
                 <ref role="3cqZAo" node="3HJTsBn61Rx" resolve="rightRepr" />
               </node>
               <node concept="liA8E" id="390NiL16Gvg" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -7083,11 +7083,11 @@
                     <ref role="3cqZAo" node="390NiL16JOx" resolve="subs" />
                   </node>
                   <node concept="liA8E" id="390NiL16JOE" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Substitution.failureCause():jetbrains.mps.unification.Substitution$FailureCause" resolve="failureCause" />
+                    <ref role="37wK5l" to="yt73:~Substitution.failureCause()" resolve="failureCause" />
                   </node>
                 </node>
                 <node concept="liA8E" id="390NiL16JOF" role="2OqNvi">
-                  <ref role="37wK5l" to="yt73:~Substitution$FailureCause.toString():java.lang.String" resolve="toString" />
+                  <ref role="37wK5l" to="yt73:~Substitution$FailureCause.toString()" resolve="toString" />
                 </node>
               </node>
             </node>
@@ -7098,7 +7098,7 @@
                 <node concept="37vLTI" id="390NiL16JOJ" role="3clFbG">
                   <node concept="2YIFZM" id="390NiL16JOK" role="37vLTx">
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                     <node concept="Xl_RD" id="390NiL16JOL" role="37wK5m">
                       <property role="Xl_RC" value="'%s' != '%s'" />
                     </node>
@@ -7107,7 +7107,7 @@
                         <ref role="3cqZAo" node="390NiL16JOx" resolve="subs" />
                       </node>
                       <node concept="liA8E" id="390NiL16JOO" role="2OqNvi">
-                        <ref role="37wK5l" to="yt73:~Substitution.failureDetails():java.lang.Object[]" resolve="failureDetails" />
+                        <ref role="37wK5l" to="yt73:~Substitution.failureDetails()" resolve="failureDetails" />
                       </node>
                     </node>
                   </node>
@@ -7128,7 +7128,7 @@
                     <ref role="3cqZAo" node="390NiL16JOx" resolve="subs" />
                   </node>
                   <node concept="liA8E" id="390NiL16JOV" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Substitution.failureCause():jetbrains.mps.unification.Substitution$FailureCause" resolve="failureCause" />
+                    <ref role="37wK5l" to="yt73:~Substitution.failureCause()" resolve="failureCause" />
                   </node>
                 </node>
               </node>
@@ -7139,7 +7139,7 @@
                     <ref role="3cqZAo" node="390NiL16JOx" resolve="subs" />
                   </node>
                   <node concept="liA8E" id="390NiL16JP0" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Substitution.failureDetails():java.lang.Object[]" resolve="failureDetails" />
+                    <ref role="37wK5l" to="yt73:~Substitution.failureDetails()" resolve="failureDetails" />
                   </node>
                 </node>
               </node>
@@ -7663,11 +7663,11 @@
                       <ref role="3cqZAo" node="2UGjFq4lPBJ" resolve="invocation" />
                     </node>
                     <node concept="liA8E" id="2UGjFq4lPV7" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                     </node>
                   </node>
                   <node concept="liA8E" id="2UGjFq4lQ3A" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                    <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                     <node concept="3cmrfG" id="2UGjFq4lQ6T" role="37wK5m">
                       <property role="3cmrfH" value="0" />
                     </node>
@@ -7719,11 +7719,11 @@
                         <ref role="3cqZAo" node="2UGjFq4lQgb" resolve="invocation" />
                       </node>
                       <node concept="liA8E" id="2UGjFq4lR5V" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                        <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                       </node>
                     </node>
                     <node concept="liA8E" id="2UGjFq4lRfo" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                      <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                       <node concept="3cmrfG" id="2UGjFq4lRja" role="37wK5m">
                         <property role="3cmrfH" value="0" />
                       </node>
@@ -7774,7 +7774,7 @@
                   <ref role="3cqZAo" node="7ISVfSJ19s" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="5uFPQ7CiQsu" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                  <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                 </node>
               </node>
             </node>
@@ -7814,7 +7814,7 @@
                     <ref role="3cqZAo" node="7ISVfSJ1ol" resolve="logical" />
                   </node>
                   <node concept="liA8E" id="3eLgHzX3VwK" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                    <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
                   </node>
                 </node>
               </node>
@@ -8007,7 +8007,7 @@
                       <ref role="3cqZAo" node="5WBVN_M2Qjq" resolve="invocation" />
                     </node>
                     <node concept="liA8E" id="5WBVN_M2RSG" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
                     </node>
                   </node>
                 </node>
@@ -8031,11 +8031,11 @@
                     <ref role="3cqZAo" node="5WBVN_M2Qjq" resolve="invocation" />
                   </node>
                   <node concept="liA8E" id="1v5snkI5gi2" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="1v5snkI5gi3" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="1v5snkI5gi4" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -8127,11 +8127,11 @@
                             <ref role="3cqZAo" node="5WBVN_M2Qjf" resolve="invocation" />
                           </node>
                           <node concept="liA8E" id="2UGjFq4pGBj" role="2OqNvi">
-                            <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                            <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
                           </node>
                         </node>
                         <node concept="liA8E" id="2UGjFq4pGMy" role="2OqNvi">
-                          <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                          <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                         </node>
                       </node>
                       <node concept="Xl_RD" id="2UGjFq4pFcY" role="3uHU7B">
@@ -8407,11 +8407,11 @@
                         <ref role="3cqZAo" node="4jcOV4hx9Eo" resolve="invocation" />
                       </node>
                       <node concept="liA8E" id="4jcOV4hxo3E" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                        <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
                       </node>
                     </node>
                     <node concept="liA8E" id="4jcOV4hxpET" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -8459,7 +8459,7 @@
                       <ref role="3cqZAo" node="4jcOV4hx9Fc" resolve="invocation" />
                     </node>
                     <node concept="liA8E" id="4jcOV4hx9EA" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
                     </node>
                   </node>
                 </node>
@@ -8474,18 +8474,18 @@
               </node>
               <node concept="2YIFZM" id="4jcOV4hxADP" role="33vP2m">
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(char[]):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(char[])" resolve="valueOf" />
                 <node concept="2OqwBi" id="4jcOV4hx_1A" role="37wK5m">
                   <node concept="2OqwBi" id="4jcOV4hx_1B" role="2Oq$k0">
                     <node concept="37vLTw" id="4jcOV4hx_1C" role="2Oq$k0">
                       <ref role="3cqZAo" node="4jcOV4hx9Fc" resolve="invocation" />
                     </node>
                     <node concept="liA8E" id="4jcOV4hx_1D" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                     </node>
                   </node>
                   <node concept="liA8E" id="4jcOV4hx_1E" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                    <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                     <node concept="3cmrfG" id="4jcOV4hx_1F" role="37wK5m">
                       <property role="3cmrfH" value="0" />
                     </node>
@@ -8504,18 +8504,18 @@
                 <ref role="37wK5l" node="4jcOV4hxCVB" resolve="severityFromString" />
                 <node concept="2YIFZM" id="4jcOV4hxMnh" role="37wK5m">
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(char[]):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(char[])" resolve="valueOf" />
                   <node concept="2OqwBi" id="4jcOV4hxMni" role="37wK5m">
                     <node concept="2OqwBi" id="4jcOV4hxMnj" role="2Oq$k0">
                       <node concept="37vLTw" id="4jcOV4hxMnk" role="2Oq$k0">
                         <ref role="3cqZAo" node="4jcOV4hx9Fc" resolve="invocation" />
                       </node>
                       <node concept="liA8E" id="4jcOV4hxMnl" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                        <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                       </node>
                     </node>
                     <node concept="liA8E" id="4jcOV4hxMnm" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                      <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                       <node concept="3cmrfG" id="4jcOV4hxMnn" role="37wK5m">
                         <property role="3cmrfH" value="1" />
                       </node>
@@ -8532,11 +8532,11 @@
                   <ref role="3cqZAo" node="4jcOV4hx9Fc" resolve="invocation" />
                 </node>
                 <node concept="liA8E" id="4jcOV4hxxNP" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~PredicateInvocation.invocationContext():jetbrains.mps.logic.reactor.evaluation.InvocationContext" resolve="invocationContext" />
+                  <ref role="37wK5l" to="w7la:~PredicateInvocation.invocationContext()" resolve="invocationContext" />
                 </node>
               </node>
               <node concept="liA8E" id="4jcOV4hxy0C" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~InvocationContext.report(jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback):void" resolve="report" />
+                <ref role="37wK5l" to="w7la:~InvocationContext.report(jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback)" resolve="report" />
                 <node concept="2YIFZM" id="473$26GHA4W" role="37wK5m">
                   <ref role="1Pybhc" to="w7la:~EvaluationFeedback" resolve="EvaluationFeedback" />
                   <ref role="37wK5l" to="w7la:~EvaluationFeedback.details(java.lang.String,jetbrains.mps.logic.reactor.evaluation.EvaluationFeedback$Severity)" resolve="details" />
@@ -8823,11 +8823,11 @@
                         <ref role="3cqZAo" node="4jcOV4hENEg" resolve="invocation" />
                       </node>
                       <node concept="liA8E" id="4jcOV4hENEr" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                        <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
                       </node>
                     </node>
                     <node concept="liA8E" id="4jcOV4hENEs" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -8875,7 +8875,7 @@
                       <ref role="3cqZAo" node="4jcOV4hENEy" resolve="invocation" />
                     </node>
                     <node concept="liA8E" id="4jcOV4hENEK" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
                     </node>
                   </node>
                 </node>
@@ -8890,18 +8890,18 @@
               </node>
               <node concept="2YIFZM" id="4jcOV4hENEO" role="33vP2m">
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(char[]):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(char[])" resolve="valueOf" />
                 <node concept="2OqwBi" id="4jcOV4hENEP" role="37wK5m">
                   <node concept="2OqwBi" id="4jcOV4hENEQ" role="2Oq$k0">
                     <node concept="37vLTw" id="4jcOV4hENER" role="2Oq$k0">
                       <ref role="3cqZAo" node="4jcOV4hENEy" resolve="invocation" />
                     </node>
                     <node concept="liA8E" id="4jcOV4hENES" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                     </node>
                   </node>
                   <node concept="liA8E" id="4jcOV4hENET" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                    <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                     <node concept="3cmrfG" id="4jcOV4hENEU" role="37wK5m">
                       <property role="3cmrfH" value="0" />
                     </node>
diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
index 667e77b2..aa6466d1 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.unification.mps
@@ -311,7 +311,7 @@
               <ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
             </node>
             <node concept="liA8E" id="7HUwyZbdPaE" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~MetaLogical.isWildcard():boolean" resolve="isWildcard" />
+              <ref role="37wK5l" to="bj13:~MetaLogical.isWildcard()" resolve="isWildcard" />
             </node>
           </node>
         </node>
@@ -345,11 +345,11 @@
                 <ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
               </node>
               <node concept="liA8E" id="7HUwyZbdW4K" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
+                <ref role="37wK5l" to="bj13:~MetaLogical.type()" resolve="type" />
               </node>
             </node>
             <node concept="liA8E" id="6OUp3PsSKJ7" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
               <node concept="37vLTw" id="6OUp3PsSKQb" role="37wK5m">
                 <ref role="3cqZAo" node="7HUwyZbdPnp" resolve="klass" />
               </node>
@@ -446,7 +446,7 @@
               <ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
             </node>
             <node concept="liA8E" id="4sSe4$pscXp" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~MetaLogical.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="bj13:~MetaLogical.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -474,7 +474,7 @@
                   <ref role="3cqZAo" node="7HUwyZbdNB$" resolve="metaLogical" />
                 </node>
                 <node concept="liA8E" id="3gNap3ffK22" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
+                  <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
                 </node>
               </node>
               <node concept="3cmrfG" id="3gNap3ffK23" role="3uHU7w">
@@ -530,7 +530,7 @@
               </node>
             </node>
             <node concept="liA8E" id="3gNap3ffK2p" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
               <node concept="2OqwBi" id="3gNap3ffK2q" role="37wK5m">
                 <node concept="1eOMI4" id="3gNap3ffK2r" role="2Oq$k0">
                   <node concept="10QFUN" id="3gNap3ffK2s" role="1eOMHV">
@@ -645,7 +645,7 @@
               <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
             </node>
             <node concept="liA8E" id="4TCblo5MV1e" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~Logical.isWildcard():boolean" resolve="isWildcard" />
+              <ref role="37wK5l" to="bj13:~Logical.isWildcard()" resolve="isWildcard" />
             </node>
           </node>
         </node>
@@ -680,7 +680,7 @@
                 <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
               </node>
               <node concept="liA8E" id="4TCblo5PfRq" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.metaLogical():jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="metaLogical" />
+                <ref role="37wK5l" to="bj13:~Logical.metaLogical()" resolve="metaLogical" />
               </node>
             </node>
           </node>
@@ -693,15 +693,15 @@
                       <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
                     </node>
                     <node concept="liA8E" id="4TCblo5Pi8Z" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.metaLogical():jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="metaLogical" />
+                      <ref role="37wK5l" to="bj13:~Logical.metaLogical()" resolve="metaLogical" />
                     </node>
                   </node>
                   <node concept="liA8E" id="4TCblo5Pj6t" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
+                    <ref role="37wK5l" to="bj13:~MetaLogical.type()" resolve="type" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6OUp3PsSHqC" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                   <node concept="37vLTw" id="6OUp3PsSJNn" role="37wK5m">
                     <ref role="3cqZAo" node="4TCblo5MWaD" resolve="klass" />
                   </node>
@@ -744,11 +744,11 @@
                     <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
                   </node>
                   <node concept="liA8E" id="4TCblo5NeWU" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                   </node>
                 </node>
                 <node concept="liA8E" id="4TCblo5NfQc" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                 </node>
               </node>
             </node>
@@ -759,7 +759,7 @@
               <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
             </node>
             <node concept="liA8E" id="4TCblo5Ndxq" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+              <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
             </node>
           </node>
           <node concept="9aQIb" id="4TCblo5Nikj" role="9aQIa">
@@ -808,7 +808,7 @@
               <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
             </node>
             <node concept="liA8E" id="4TCblo5MRBz" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+              <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
             </node>
           </node>
           <node concept="9aQIb" id="4TCblo5MQHu" role="9aQIa">
@@ -851,7 +851,7 @@
                 <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
               </node>
               <node concept="liA8E" id="3gNap3ffJAC" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -895,7 +895,7 @@
               <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
             </node>
             <node concept="liA8E" id="4TCblo5MZKI" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -923,7 +923,7 @@
                   <ref role="3cqZAo" node="4TCblo5MOOn" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="4TCblo5N3Oz" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
+                  <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
                 </node>
               </node>
               <node concept="3cmrfG" id="4TCblo5N55b" role="3uHU7w">
@@ -979,7 +979,7 @@
               </node>
             </node>
             <node concept="liA8E" id="4TCblo5N8WJ" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
               <node concept="2OqwBi" id="4TCblo5Na0e" role="37wK5m">
                 <node concept="1eOMI4" id="4TCblo5N9Mc" role="2Oq$k0">
                   <node concept="10QFUN" id="4TCblo5N9Md" role="1eOMHV">
@@ -1078,7 +1078,7 @@
               <ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
             </node>
             <node concept="liA8E" id="7BhUeN7y$2Z" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+              <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
             </node>
           </node>
           <node concept="3clFbS" id="7BhUeN7yx2g" role="3clFbx">
@@ -1089,11 +1089,11 @@
                     <ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
                   </node>
                   <node concept="liA8E" id="7BhUeN7yAJo" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                   </node>
                 </node>
                 <node concept="liA8E" id="7BhUeN7yB7W" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                 </node>
               </node>
             </node>
@@ -1127,7 +1127,7 @@
               <ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
             </node>
             <node concept="liA8E" id="3gNap3fN2jY" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~Logical.isWildcard():boolean" resolve="isWildcard" />
+              <ref role="37wK5l" to="bj13:~Logical.isWildcard()" resolve="isWildcard" />
             </node>
           </node>
         </node>
@@ -1160,7 +1160,7 @@
               <ref role="3VsUkX" to="6exd:2xQ7eRAD2dj" resolve="Value" />
             </node>
             <node concept="liA8E" id="3gNap3fN3Rf" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
               <node concept="37vLTw" id="3gNap3fN3SA" role="37wK5m">
                 <ref role="3cqZAo" node="3gNap3fN2m4" resolve="klass" />
               </node>
@@ -1227,7 +1227,7 @@
               <ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
             </node>
             <node concept="liA8E" id="7BhUeN7ylN8" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+              <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
             </node>
           </node>
           <node concept="9aQIb" id="7BhUeN7ylX0" role="9aQIa">
@@ -1270,7 +1270,7 @@
                 <ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
               </node>
               <node concept="liA8E" id="7BhUeN7yoA4" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -1314,7 +1314,7 @@
               <ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
             </node>
             <node concept="liA8E" id="3gNap3fN7WR" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1342,7 +1342,7 @@
                   <ref role="3cqZAo" node="3gNap3fN2iq" resolve="logical" />
                 </node>
                 <node concept="liA8E" id="3gNap3fN7X4" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
+                  <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
                 </node>
               </node>
               <node concept="3cmrfG" id="3gNap3fN7X5" role="3uHU7w">
@@ -1398,7 +1398,7 @@
               </node>
             </node>
             <node concept="liA8E" id="3gNap3fN7Xr" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
               <node concept="2OqwBi" id="3gNap3fN7Xs" role="37wK5m">
                 <node concept="1eOMI4" id="3gNap3fN7Xt" role="2Oq$k0">
                   <node concept="10QFUN" id="3gNap3fN7Xu" role="1eOMHV">
@@ -1517,7 +1517,7 @@
               <ref role="3cqZAo" node="3gNap3fNdyC" resolve="metaLogical" />
             </node>
             <node concept="liA8E" id="3gNap3fNd$L" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~MetaLogical.isWildcard():boolean" resolve="isWildcard" />
+              <ref role="37wK5l" to="bj13:~MetaLogical.isWildcard()" resolve="isWildcard" />
             </node>
           </node>
         </node>
@@ -1550,7 +1550,7 @@
               <ref role="3VsUkX" to="6exd:2xQ7eRAD2dj" resolve="Value" />
             </node>
             <node concept="liA8E" id="3gNap3fNdAI" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
               <node concept="37vLTw" id="3gNap3fNdAJ" role="37wK5m">
                 <ref role="3cqZAo" node="3gNap3fNd_w" resolve="klass" />
               </node>
@@ -1647,7 +1647,7 @@
               <ref role="3cqZAo" node="3gNap3fNdyC" resolve="metaLogical" />
             </node>
             <node concept="liA8E" id="3gNap3fNdGf" role="2OqNvi">
-              <ref role="37wK5l" to="bj13:~MetaLogical.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="bj13:~MetaLogical.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1675,7 +1675,7 @@
                   <ref role="3cqZAo" node="3gNap3fNdyC" resolve="metaLogical" />
                 </node>
                 <node concept="liA8E" id="3gNap3fNdGs" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
+                  <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
                 </node>
               </node>
               <node concept="3cmrfG" id="3gNap3fNdGt" role="3uHU7w">
@@ -1731,7 +1731,7 @@
               </node>
             </node>
             <node concept="liA8E" id="3gNap3fNdGN" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
               <node concept="2OqwBi" id="3gNap3fNdGO" role="37wK5m">
                 <node concept="1eOMI4" id="3gNap3fNdGP" role="2Oq$k0">
                   <node concept="10QFUN" id="3gNap3fNdGQ" role="1eOMHV">
@@ -1806,7 +1806,7 @@
                       <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
                     </node>
                     <node concept="liA8E" id="7HUwyZbdR3y" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
+                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality()" resolve="cardinality" />
                     </node>
                   </node>
                 </node>
@@ -1836,7 +1836,7 @@
                       <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
                     </node>
                     <node concept="liA8E" id="7HUwyZbdRgZ" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int):jetbrains.mps.logic.reactor.logical.MetaLogical" resolve="logicalAt" />
+                      <ref role="37wK5l" to="bj13:~MultiMetaLogical.logicalAt(int)" resolve="logicalAt" />
                       <node concept="37vLTw" id="7HUwyZbdRiC" role="37wK5m">
                         <ref role="3cqZAo" node="7HUwyZb7b8h" resolve="i" />
                       </node>
@@ -1862,7 +1862,7 @@
                 <ref role="3cqZAo" node="7HUwyZb7b7D" resolve="multiMetaLogical" />
               </node>
               <node concept="liA8E" id="7HUwyZbdR6B" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality():int" resolve="cardinality" />
+                <ref role="37wK5l" to="bj13:~MultiMetaLogical.cardinality()" resolve="cardinality" />
               </node>
             </node>
           </node>
@@ -2172,7 +2172,7 @@
                         <ref role="3cqZAo" node="4TCblo5MI7r" resolve="logicalContext" />
                       </node>
                       <node concept="liA8E" id="3gNap3fZcZv" role="2OqNvi">
-                        <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
+                        <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="variable" />
                         <node concept="2OqwBi" id="3gNap3fZcZw" role="37wK5m">
                           <node concept="1eOMI4" id="3gNap3fZcZx" role="2Oq$k0">
                             <node concept="10QFUN" id="3gNap3fZcZy" role="1eOMHV">
@@ -2204,7 +2204,7 @@
                       <ref role="3cqZAo" node="4TCblo5MI7r" resolve="logicalContext" />
                     </node>
                     <node concept="liA8E" id="3gNap3fZcU9" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical):jetbrains.mps.logic.reactor.logical.Logical" resolve="variable" />
+                      <ref role="37wK5l" to="bj13:~LogicalContext.variable(jetbrains.mps.logic.reactor.logical.MetaLogical)" resolve="variable" />
                       <node concept="2OqwBi" id="3gNap3fZcUa" role="37wK5m">
                         <node concept="1eOMI4" id="3gNap3fZcUb" role="2Oq$k0">
                           <node concept="10QFUN" id="3gNap3fZcUc" role="1eOMHV">
diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
index 2308f25d..4364b19c 100644
--- a/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.annotation/jetbrains.mps.typechecking.annotation.mpl
@@ -31,9 +31,9 @@
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
index 68626c5f..ea34b182 100644
--- a/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.annotation/languageModels/intentions.mps
@@ -200,7 +200,7 @@
             <property role="TrG5h" value="text" />
             <node concept="17QB3L" id="1FOQehwZfE_" role="1tU5fm" />
             <node concept="2YIFZM" id="7KcYPxpVjXr" role="33vP2m">
-              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
               <node concept="2OqwBi" id="7KcYPxpVjXs" role="37wK5m">
                 <node concept="2Sf5sV" id="7KcYPxpVjXt" role="2Oq$k0" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
index f1ad4b62..d7b7e3ac 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/jetbrains.mps.typechecking.testlang.mpl
@@ -23,12 +23,12 @@
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -73,16 +73,16 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps
index 126c6d91..22e5d055 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/editor.mps
@@ -456,7 +456,7 @@
               </node>
               <node concept="tyxLq" id="7mB3viLb$9F" role="2OqNvi">
                 <node concept="2YIFZM" id="7mB3viLb$D4" role="tz02z">
-                  <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String):java.lang.Integer" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
                   <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
                   <node concept="ub8z3" id="7mB3viLb$Lt" role="37wK5m" />
                 </node>
@@ -657,7 +657,7 @@
                 <node concept="2OqwBi" id="7mB3viLh1na" role="37vLTx">
                   <node concept="ub8z3" id="7mB3viLh13D" role="2Oq$k0" />
                   <node concept="liA8E" id="7mB3viLh2bE" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.substring(int):java.lang.String" resolve="substring" />
+                    <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
                     <node concept="3cmrfG" id="7mB3viLh2io" role="37wK5m">
                       <property role="3cmrfH" value="1" />
                     </node>
@@ -675,7 +675,7 @@
               <node concept="2OqwBi" id="7mB3viLhw1z" role="3clFbG">
                 <node concept="1Q80Hx" id="7mB3viLhvtt" role="2Oq$k0" />
                 <node concept="liA8E" id="7mB3viLhwvk" role="2OqNvi">
-                  <ref role="37wK5l" to="cj4x:~EditorContext.selectWRTFocusPolicy(org.jetbrains.mps.openapi.model.SNode):void" resolve="selectWRTFocusPolicy" />
+                  <ref role="37wK5l" to="cj4x:~EditorContext.selectWRTFocusPolicy(org.jetbrains.mps.openapi.model.SNode)" resolve="selectWRTFocusPolicy" />
                   <node concept="7Obwk" id="7mB3viLhx3z" role="37wK5m" />
                 </node>
               </node>
diff --git a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
index c058d595..af48e7a1 100644
--- a/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
+++ b/coderules/languages/jetbrains.mps.typechecking.testlang/models/types.mps
@@ -5,7 +5,7 @@
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
@@ -509,7 +509,7 @@
                   <node concept="3wWvb2" id="7mB3viLicin" role="3I6s78">
                     <node concept="2dkUwp" id="7mB3viLie3k" role="3wWo3s">
                       <node concept="2YIFZM" id="7mB3viLiciz" role="3uHU7B">
-                        <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String):java.lang.Integer" resolve="valueOf" />
+                        <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
                         <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
                         <node concept="1TmgYN" id="7mB3viLicQJ" role="37wK5m">
                           <node concept="1nq8_$" id="7mB3viLicSp" role="1Tms7$">
@@ -520,7 +520,7 @@
                         </node>
                       </node>
                       <node concept="2YIFZM" id="7mB3viLie5Z" role="3uHU7w">
-                        <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String):java.lang.Integer" resolve="valueOf" />
+                        <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
                         <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
                         <node concept="1TmgYN" id="7mB3viLie60" role="37wK5m">
                           <node concept="1nq8_$" id="7mB3viLie61" role="1Tms7$">
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd b/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
index 1a84b15f..acc919e8 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.test/jetbrains.mps.coderules.test.msd
@@ -13,9 +13,47 @@
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="true">707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)</dependency>
   </dependencies>
-  <languageVersions />
+  <languageVersions>
+    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="8" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
+    <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
+    <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
+    <language slang="l:3600cb0a-44dd-4a5b-9968-22924406419e:jetbrains.mps.build.mps.tests" version="1" />
+    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
+    <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
+    <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
+    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
+  </languageVersions>
   <dependencyVersions>
+    <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="847a3235-09f9-403c-b6a9-1c294a212e92(Ant)" version="0" />
+    <module reference="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86(Hamcrest)" version="0" />
+    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" version="0" />
+    <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
+    <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
+    <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
+    <module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
+    <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
+    <module reference="920eaa0e-ecca-46bc-bee7-4e5c59213dd6(Testbench)" version="0" />
+    <module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
+    <module reference="443f4c36-fcf5-4eb6-9500-8d06ed259e3e(jetbrains.mps.baseLanguage.classifiers)" version="0" />
+    <module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
+    <module reference="f61473f9-130f-42f6-b98d-6c438812c2f6(jetbrains.mps.baseLanguage.unitTest)" version="0" />
     <module reference="c18711cb-f08b-4fae-81b0-1dd840be9c90(jetbrains.mps.coderules.test)" version="0" />
+    <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
+    <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
+    <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
+    <module reference="8585453e-6bfb-4d80-98de-b16074f1d86c(jetbrains.mps.lang.test)" version="0" />
+    <module reference="707c4fde-f79a-44b5-b3d7-b5cef8844ccf(jetbrains.mps.lang.test.runtime)" version="0" />
+    <module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
   </dependencyVersions>
 </solution>
 
diff --git a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
index df89e112..8fe00822 100644
--- a/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.test/models/modelcheck@tests.mps
@@ -280,7 +280,7 @@
               <node concept="10Nm6u" id="2rIdnPwwLKh" role="3uHU7w" />
               <node concept="2YIFZM" id="2KEPLp6ICYM" role="3uHU7B">
                 <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String):java.lang.String" resolve="getProperty" />
+                <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String)" resolve="getProperty" />
                 <node concept="Xl_RD" id="2KEPLp6ICYN" role="37wK5m">
                   <property role="Xl_RC" value="mps.test.modules" />
                 </node>
@@ -384,7 +384,7 @@
           </node>
           <node concept="2YIFZM" id="1Lr58WFTEwF" role="37wK5m">
             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
             <node concept="1Xw6AR" id="1Lr58WFTEwG" role="37wK5m">
               <node concept="1dCxOl" id="1Lr58WFTEwH" role="1XwpL7">
                 <property role="1XweGQ" value="r:cc1a7719-27fc-407d-bcc3-f0a29456923e" />
@@ -502,7 +502,7 @@
                         <ref role="1PxDUh" to="d6hs:~NodeFlavouredItem" resolve="NodeFlavouredItem" />
                       </node>
                       <node concept="liA8E" id="1Lr58WFXFJa" role="2OqNvi">
-                        <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem):java.lang.Object" resolve="tryToGet" />
+                        <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="tryToGet" />
                         <node concept="37vLTw" id="1Lr58WFXIle" role="37wK5m">
                           <ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
                         </node>
@@ -516,7 +516,7 @@
                     <ref role="1PxDUh" to="d6hs:~NodeFlavouredItem" resolve="NodeFlavouredItem" />
                   </node>
                   <node concept="liA8E" id="1Lr58WFX_tm" role="2OqNvi">
-                    <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem):boolean" resolve="canGet" />
+                    <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="canGet" />
                     <node concept="37vLTw" id="1Lr58WFX__e" role="37wK5m">
                       <ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
                     </node>
@@ -528,7 +528,7 @@
                   <node concept="3cpWs6" id="1Lr58WFXIuP" role="3cqZAp">
                     <node concept="2OqwBi" id="1Lr58WFXIuQ" role="3cqZAk">
                       <node concept="liA8E" id="1Lr58WFXIuS" role="2OqNvi">
-                        <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem):java.lang.Object" resolve="tryToGet" />
+                        <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="tryToGet" />
                         <node concept="37vLTw" id="1Lr58WFXIuT" role="37wK5m">
                           <ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
                         </node>
@@ -546,7 +546,7 @@
                     <ref role="1PxDUh" to="d6hs:~ModelFlavouredItem" resolve="ModelFlavouredItem" />
                   </node>
                   <node concept="liA8E" id="1Lr58WFXIuW" role="2OqNvi">
-                    <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem):boolean" resolve="canGet" />
+                    <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="canGet" />
                     <node concept="37vLTw" id="1Lr58WFXIuX" role="37wK5m">
                       <ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
                     </node>
@@ -558,7 +558,7 @@
                   <node concept="3cpWs6" id="1Lr58WFXJex" role="3cqZAp">
                     <node concept="2OqwBi" id="1Lr58WFXJey" role="3cqZAk">
                       <node concept="liA8E" id="1Lr58WFXJez" role="2OqNvi">
-                        <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem):java.lang.Object" resolve="tryToGet" />
+                        <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.tryToGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="tryToGet" />
                         <node concept="37vLTw" id="1Lr58WFXJe$" role="37wK5m">
                           <ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
                         </node>
@@ -576,7 +576,7 @@
                     <ref role="1PxDUh" to="d6hs:~ModuleFlavouredItem" resolve="ModuleFlavouredItem" />
                   </node>
                   <node concept="liA8E" id="1Lr58WFXJeC" role="2OqNvi">
-                    <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem):boolean" resolve="canGet" />
+                    <ref role="37wK5l" to="d6hs:~FlavouredItem$ReportItemFlavour.canGet(jetbrains.mps.errors.item.FlavouredItem)" resolve="canGet" />
                     <node concept="37vLTw" id="1Lr58WFXJeD" role="37wK5m">
                       <ref role="3cqZAo" node="1Lr58WFXqkn" resolve="reportItem" />
                     </node>
@@ -674,7 +674,7 @@
             <node concept="2OqwBi" id="1Lr58WFTIHh" role="2GsD0m">
               <node concept="1jxXqW" id="1Lr58WFTIHi" role="2Oq$k0" />
               <node concept="liA8E" id="1Lr58WFTIHj" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~IProject.getProjectModules():java.util.List" resolve="getProjectModules" />
+                <ref role="37wK5l" to="z1c3:~IProject.getProjectModules()" resolve="getProjectModules" />
               </node>
             </node>
             <node concept="3clFbS" id="1Lr58WFTIHk" role="2LFqv$">
@@ -741,7 +741,7 @@
                 <node concept="2OqwBi" id="1Lr58WFTIHJ" role="37wK5m">
                   <node concept="1jxXqW" id="1Lr58WFTIHK" role="2Oq$k0" />
                   <node concept="liA8E" id="1Lr58WFTIHL" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="1Lr58WFTIHM" role="37wK5m">
@@ -770,7 +770,7 @@
                   <ref role="3cqZAo" node="1Lr58WFTIHu" resolve="collectConsumer" />
                 </node>
                 <node concept="liA8E" id="1Lr58WFTIHW" role="2OqNvi">
-                  <ref role="37wK5l" to="18ew:~CollectConsumer.getResult():java.util.Collection" resolve="getResult" />
+                  <ref role="37wK5l" to="18ew:~CollectConsumer.getResult()" resolve="getResult" />
                 </node>
               </node>
             </node>
@@ -794,7 +794,7 @@
                       <ref role="2Gs0qQ" node="1Lr58WFTIHY" resolve="r" />
                     </node>
                     <node concept="liA8E" id="1Lr58WFTII6" role="2OqNvi">
-                      <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
+                      <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity()" resolve="getSeverity" />
                     </node>
                   </node>
                 </node>
@@ -808,7 +808,7 @@
                   </node>
                   <node concept="2OqwBi" id="1Lr58WFTIIx" role="33vP2m">
                     <node concept="liA8E" id="1Lr58WFTIIz" role="2OqNvi">
-                      <ref role="37wK5l" to="d6hs:~ReportItemBase$SimpleReportItemFlavour.get(jetbrains.mps.errors.item.FlavouredItem):java.lang.Object" resolve="get" />
+                      <ref role="37wK5l" to="d6hs:~ReportItemBase$SimpleReportItemFlavour.get(jetbrains.mps.errors.item.FlavouredItem)" resolve="get" />
                       <node concept="2GrUjf" id="1Lr58WFTII$" role="37wK5m">
                         <ref role="2Gs0qQ" node="1Lr58WFTIHY" resolve="r" />
                       </node>
@@ -837,7 +837,7 @@
                             <ref role="2Gs0qQ" node="1Lr58WFTIHY" resolve="r" />
                           </node>
                           <node concept="liA8E" id="1Lr58WFUGgU" role="2OqNvi">
-                            <ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
+                            <ref role="37wK5l" to="d6hs:~ReportItem.getMessage()" resolve="getMessage" />
                           </node>
                         </node>
                         <node concept="Xl_RD" id="1Lr58WFUGgV" role="3uHU7w">
@@ -855,7 +855,7 @@
                     <ref role="3cqZAo" node="1Lr58WFTGDC" resolve="myErrorCollector" />
                   </node>
                   <node concept="liA8E" id="1Lr58WFUws3" role="2OqNvi">
-                    <ref role="37wK5l" to="a19p:~ErrorCollector.checkThat(java.lang.String,java.lang.Object,org.hamcrest.Matcher):void" resolve="checkThat" />
+                    <ref role="37wK5l" to="a19p:~ErrorCollector.checkThat(java.lang.String,java.lang.Object,org.hamcrest.Matcher)" resolve="checkThat" />
                     <node concept="37vLTw" id="1Lr58WFUGgW" role="37wK5m">
                       <ref role="3cqZAo" node="1Lr58WFUGgK" resolve="reason" />
                     </node>
@@ -863,7 +863,7 @@
                       <ref role="3cqZAo" node="1Lr58WFTII2" resolve="severity" />
                     </node>
                     <node concept="2YIFZM" id="1Lr58WFUBmv" role="37wK5m">
-                      <ref role="37wK5l" to="fczk:~IsNot.not(java.lang.Object):org.hamcrest.Matcher" resolve="not" />
+                      <ref role="37wK5l" to="fczk:~IsNot.not(java.lang.Object)" resolve="not" />
                       <ref role="1Pybhc" to="fczk:~IsNot" resolve="IsNot" />
                       <node concept="Rm8GO" id="1Lr58WFUBqA" role="37wK5m">
                         <ref role="Rm8GQ" to="2gg1:~MessageStatus.ERROR" resolve="ERROR" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
index a4909590..1427dad8 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/jetbrains.mps.coderules.typechecking.test.msd
@@ -31,8 +31,8 @@
     <language slang="l:aee9cad2-acd4-4608-aef2-0004f6a1cdbd:jetbrains.mps.lang.actions" version="4" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
index 532afcbe..d3f56691 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.scheduling@tests.mps
@@ -233,14 +233,14 @@
                 <ref role="3cqZAo" node="3KwBCAAvoo8" resolve="from" />
               </node>
               <node concept="liA8E" id="3KwBCAAvq5K" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
+                <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
                 <node concept="37vLTw" id="3KwBCAAvUzM" role="37wK5m">
                   <ref role="3cqZAo" node="3KwBCAAvTlq" resolve="scheduler" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="3KwBCAAvrSp" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="3KwBCAAvs4S" role="37wK5m">
                 <node concept="3clFbS" id="3KwBCAAvs4T" role="1bW5cS">
                   <node concept="3cpWs8" id="3KwBCAAvDKQ" role="3cqZAp">
@@ -291,7 +291,7 @@
                     <node concept="2OqwBi" id="3KwBCAAwANk" role="ukAjM">
                       <node concept="1jxXqW" id="3KwBCAAwAnn" role="2Oq$k0" />
                       <node concept="liA8E" id="3KwBCAAwBHn" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
                   </node>
@@ -359,14 +359,14 @@
                 <ref role="3cqZAo" node="3KwBCAAyxIp" resolve="from" />
               </node>
               <node concept="liA8E" id="3KwBCAAywI_" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
+                <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
                 <node concept="37vLTw" id="3KwBCAAywIA" role="37wK5m">
                   <ref role="3cqZAo" node="3KwBCAAyxIn" resolve="scheduler" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="3KwBCAAywIB" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="3KwBCAAywIC" role="37wK5m">
                 <node concept="3clFbS" id="3KwBCAAywID" role="1bW5cS">
                   <node concept="3cpWs8" id="3KwBCAAywIE" role="3cqZAp">
@@ -417,7 +417,7 @@
                     <node concept="2OqwBi" id="3KwBCAAz44L" role="ukAjM">
                       <node concept="1jxXqW" id="3KwBCAAz3xj" role="2Oq$k0" />
                       <node concept="liA8E" id="3KwBCAAz4P_" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
                   </node>
@@ -478,16 +478,16 @@
             <node concept="2OqwBi" id="3KwBCAA$IHD" role="33vP2m">
               <node concept="2YIFZM" id="3KwBCAA$IHE" role="2Oq$k0">
                 <ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
-                <ref role="37wK5l" to="unkn:~Single.just(java.lang.Object):io.reactivex.Single" resolve="just" />
+                <ref role="37wK5l" to="unkn:~Single.just(java.lang.Object)" resolve="just" />
                 <node concept="37vLTw" id="3KwBCAA$IHF" role="37wK5m">
                   <ref role="3cqZAo" node="3KwBCAA$IHu" resolve="list" />
                 </node>
               </node>
               <node concept="liA8E" id="3KwBCAA$IHG" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="subscribeOn" />
+                <ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler)" resolve="subscribeOn" />
                 <node concept="2YIFZM" id="3KwBCAA$IHH" role="37wK5m">
                   <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
-                  <ref role="37wK5l" to="m4y7:~Schedulers.trampoline():io.reactivex.Scheduler" resolve="trampoline" />
+                  <ref role="37wK5l" to="m4y7:~Schedulers.trampoline()" resolve="trampoline" />
                 </node>
               </node>
             </node>
@@ -548,7 +548,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3KwBCAA$II6" role="2OqNvi">
-                    <ref role="37wK5l" to="unkn:~Single.to(io.reactivex.functions.Function):java.lang.Object" resolve="to" />
+                    <ref role="37wK5l" to="unkn:~Single.to(io.reactivex.functions.Function)" resolve="to" />
                     <node concept="1bVj0M" id="3KwBCAA$II7" role="37wK5m">
                       <node concept="3clFbS" id="3KwBCAA$II8" role="1bW5cS">
                         <node concept="3clFbF" id="3KwBCAA$II9" role="3cqZAp">
@@ -586,7 +586,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3KwBCAA$IIl" role="2OqNvi">
-                  <ref role="37wK5l" to="unkn:~Single.timeout(long,java.util.concurrent.TimeUnit):io.reactivex.Single" resolve="timeout" />
+                  <ref role="37wK5l" to="unkn:~Single.timeout(long,java.util.concurrent.TimeUnit)" resolve="timeout" />
                   <node concept="3cmrfG" id="3KwBCAA$IIm" role="37wK5m">
                     <property role="3cmrfH" value="1" />
                   </node>
@@ -597,7 +597,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3KwBCAA$IIo" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
+                <ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
               </node>
             </node>
           </node>
@@ -668,7 +668,7 @@
               <ref role="3cqZAo" node="3KwBCAAwUO5" resolve="sem" />
             </node>
             <node concept="liA8E" id="3KwBCAAx$_P" role="2OqNvi">
-              <ref role="37wK5l" to="5zyv:~Semaphore.acquire():void" resolve="acquire" />
+              <ref role="37wK5l" to="5zyv:~Semaphore.acquire()" resolve="acquire" />
             </node>
           </node>
         </node>
@@ -708,16 +708,16 @@
                       </node>
                       <node concept="2OqwBi" id="3KwBCAAye5s" role="33vP2m">
                         <node concept="2YIFZM" id="3KwBCAAwrbV" role="2Oq$k0">
-                          <ref role="37wK5l" to="unkn:~Single.just(java.lang.Object):io.reactivex.Single" resolve="just" />
+                          <ref role="37wK5l" to="unkn:~Single.just(java.lang.Object)" resolve="just" />
                           <ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
                           <node concept="37vLTw" id="3KwBCAAylmt" role="37wK5m">
                             <ref role="3cqZAo" node="3KwBCAAylmp" resolve="list" />
                           </node>
                         </node>
                         <node concept="liA8E" id="3KwBCAAygkh" role="2OqNvi">
-                          <ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="subscribeOn" />
+                          <ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler)" resolve="subscribeOn" />
                           <node concept="2YIFZM" id="3KwBCAAyq1I" role="37wK5m">
-                            <ref role="37wK5l" to="m4y7:~Schedulers.trampoline():io.reactivex.Scheduler" resolve="trampoline" />
+                            <ref role="37wK5l" to="m4y7:~Schedulers.trampoline()" resolve="trampoline" />
                             <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
                           </node>
                         </node>
@@ -779,7 +779,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="3KwBCAA$16O" role="2OqNvi">
-                              <ref role="37wK5l" to="unkn:~Single.to(io.reactivex.functions.Function):java.lang.Object" resolve="to" />
+                              <ref role="37wK5l" to="unkn:~Single.to(io.reactivex.functions.Function)" resolve="to" />
                               <node concept="1bVj0M" id="3KwBCAA$265" role="37wK5m">
                                 <node concept="3clFbS" id="3KwBCAA$266" role="1bW5cS">
                                   <node concept="3clFbF" id="3KwBCAA$ctG" role="3cqZAp">
@@ -817,7 +817,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="3KwBCAAwrcc" role="2OqNvi">
-                            <ref role="37wK5l" to="unkn:~Single.timeout(long,java.util.concurrent.TimeUnit):io.reactivex.Single" resolve="timeout" />
+                            <ref role="37wK5l" to="unkn:~Single.timeout(long,java.util.concurrent.TimeUnit)" resolve="timeout" />
                             <node concept="3cmrfG" id="3KwBCAAwrcd" role="37wK5m">
                               <property role="3cmrfH" value="1" />
                             </node>
@@ -828,7 +828,7 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="3KwBCAAwrcf" role="2OqNvi">
-                          <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
+                          <ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
                         </node>
                       </node>
                     </node>
@@ -868,7 +868,7 @@
                           <ref role="3cqZAo" node="3KwBCAAxblG" resolve="ex" />
                         </node>
                         <node concept="liA8E" id="3KwBCAAxnOn" role="2OqNvi">
-                          <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
+                          <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
                           <node concept="37vLTw" id="3KwBCAAxo2e" role="37wK5m">
                             <ref role="3cqZAo" node="3KwBCAAxfRl" resolve="e" />
                           </node>
@@ -890,7 +890,7 @@
                         <ref role="3cqZAo" node="3KwBCAAwUO5" resolve="sem" />
                       </node>
                       <node concept="liA8E" id="3KwBCAAx5Kf" role="2OqNvi">
-                        <ref role="37wK5l" to="5zyv:~Semaphore.release():void" resolve="release" />
+                        <ref role="37wK5l" to="5zyv:~Semaphore.release()" resolve="release" />
                       </node>
                     </node>
                   </node>
@@ -901,7 +901,7 @@
           <node concept="2OqwBi" id="3KwBCAAwzoO" role="ukAjM">
             <node concept="1jxXqW" id="3KwBCAAwz3E" role="2Oq$k0" />
             <node concept="liA8E" id="3KwBCAAw_5s" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -917,7 +917,7 @@
               <ref role="3cqZAo" node="3KwBCAAwUO5" resolve="sem" />
             </node>
             <node concept="liA8E" id="3KwBCAAwZzl" role="2OqNvi">
-              <ref role="37wK5l" to="5zyv:~Semaphore.acquire():void" resolve="acquire" />
+              <ref role="37wK5l" to="5zyv:~Semaphore.acquire()" resolve="acquire" />
             </node>
           </node>
         </node>
@@ -929,7 +929,7 @@
                   <ref role="3cqZAo" node="3KwBCAAxblG" resolve="ex" />
                 </node>
                 <node concept="liA8E" id="3KwBCAAxvjO" role="2OqNvi">
-                  <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
                 </node>
               </node>
             </node>
@@ -941,7 +941,7 @@
                 <ref role="3cqZAo" node="3KwBCAAxblG" resolve="ex" />
               </node>
               <node concept="liA8E" id="3KwBCAAxrG8" role="2OqNvi">
-                <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
               </node>
             </node>
           </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
index 1b032319..83026a99 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.test/models/jetbrains.mps.coderules.typechecking@tests.mps
@@ -5,9 +5,9 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="0" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="0" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
@@ -425,7 +425,7 @@
                       <node concept="2OqwBi" id="7mB3viLe1a7" role="Vysub">
                         <node concept="1jxXqW" id="7mB3viLe1a8" role="2Oq$k0" />
                         <node concept="liA8E" id="7mB3viLe1a9" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -463,7 +463,7 @@
                       <node concept="2OqwBi" id="7mB3viLem4a" role="Vysub">
                         <node concept="1jxXqW" id="7mB3viLem4b" role="2Oq$k0" />
                         <node concept="liA8E" id="7mB3viLem4c" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -484,7 +484,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="14$_tTxzTDA" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                     </node>
                   </node>
                 </node>
@@ -524,7 +524,7 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="443LGHB5PwJ" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                          <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                         </node>
                       </node>
                     </node>
@@ -558,7 +558,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="4vBwiiVtM9D" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                             </node>
                           </node>
                           <node concept="1bVj0M" id="6QH_LDtdXLP" role="37wK5m">
@@ -628,7 +628,7 @@
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="7mB3viLet95" role="2OqNvi">
-                                        <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                        <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                                       </node>
                                     </node>
                                     <node concept="37vLTw" id="7mB3viLetmP" role="37wK5m">
@@ -676,7 +676,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="4vBwiiVuDfC" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                             </node>
                           </node>
                         </node>
@@ -716,7 +716,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="443LGHBdKCp" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                             </node>
                           </node>
                         </node>
@@ -755,7 +755,7 @@
           <node concept="2OqwBi" id="14$_tTx$1gb" role="ukAjM">
             <node concept="1jxXqW" id="14$_tTx$0Xb" role="2Oq$k0" />
             <node concept="liA8E" id="14$_tTx$20w" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -783,7 +783,7 @@
                   <node concept="2OqwBi" id="6OXbTD_oHcq" role="33vP2m">
                     <node concept="1jxXqW" id="6OXbTD_oHcr" role="2Oq$k0" />
                     <node concept="liA8E" id="6OXbTD_oHcs" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                      <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                     </node>
                   </node>
                 </node>
@@ -1216,7 +1216,7 @@
           <node concept="2OqwBi" id="4BHjwwGV8Ht" role="ukAjM">
             <node concept="1jxXqW" id="4BHjwwGV81_" role="2Oq$k0" />
             <node concept="liA8E" id="4BHjwwGVaBV" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -1245,7 +1245,7 @@
                       <node concept="2OqwBi" id="7mB3viLfkLD" role="Vysub">
                         <node concept="1jxXqW" id="7mB3viLfkwd" role="2Oq$k0" />
                         <node concept="liA8E" id="7mB3viLfmjL" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -1268,7 +1268,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="14$_tTxzzxO" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                     </node>
                   </node>
                 </node>
@@ -1293,7 +1293,7 @@
                       <node concept="2OqwBi" id="7mB3viLf$p5" role="Vysub">
                         <node concept="1jxXqW" id="7mB3viLf$p6" role="2Oq$k0" />
                         <node concept="liA8E" id="7mB3viLf$p7" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -1399,7 +1399,7 @@
           <node concept="2OqwBi" id="14$_tTxy4GA" role="ukAjM">
             <node concept="1jxXqW" id="14$_tTxy3dO" role="2Oq$k0" />
             <node concept="liA8E" id="14$_tTxy5mA" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -1428,7 +1428,7 @@
                       <node concept="2OqwBi" id="7mB3viLfLnz" role="Vysub">
                         <node concept="1jxXqW" id="7mB3viLfLn$" role="2Oq$k0" />
                         <node concept="liA8E" id="7mB3viLfLn_" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -1451,7 +1451,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="14$_tTxz_CN" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                     </node>
                   </node>
                 </node>
@@ -1476,7 +1476,7 @@
                       <node concept="2OqwBi" id="7mB3viLfNvp" role="Vysub">
                         <node concept="1jxXqW" id="7mB3viLfNvq" role="2Oq$k0" />
                         <node concept="liA8E" id="7mB3viLfNvr" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -1578,7 +1578,7 @@
           <node concept="2OqwBi" id="14$_tTxy6$j" role="ukAjM">
             <node concept="1jxXqW" id="14$_tTxy6oh" role="2Oq$k0" />
             <node concept="liA8E" id="14$_tTxy86J" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -1607,7 +1607,7 @@
                       <node concept="2OqwBi" id="7mB3viLfUFy" role="Vysub">
                         <node concept="1jxXqW" id="7mB3viLfUFz" role="2Oq$k0" />
                         <node concept="liA8E" id="7mB3viLfUF$" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -1630,7 +1630,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3IIf9OA4zMU" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                     </node>
                   </node>
                 </node>
@@ -1799,7 +1799,7 @@
           <node concept="2OqwBi" id="3IIf9OA4zN_" role="ukAjM">
             <node concept="1jxXqW" id="3IIf9OA4zNA" role="2Oq$k0" />
             <node concept="liA8E" id="3IIf9OA4zNB" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -1839,7 +1839,7 @@
                       <node concept="2OqwBi" id="7mB3viLeGxa" role="Vysub">
                         <node concept="1jxXqW" id="7mB3viLeGbM" role="2Oq$k0" />
                         <node concept="liA8E" id="7mB3viLeHoB" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -1854,7 +1854,7 @@
           <node concept="2OqwBi" id="4BHjwwGTOgy" role="ukAjM">
             <node concept="1jxXqW" id="4BHjwwGTO1x" role="2Oq$k0" />
             <node concept="liA8E" id="4BHjwwGTOPb" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -1960,7 +1960,7 @@
           <node concept="2OqwBi" id="4BHjwwGTS2C" role="ukAjM">
             <node concept="1jxXqW" id="4BHjwwGTRMU" role="2Oq$k0" />
             <node concept="liA8E" id="4BHjwwGTTbX" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -2015,15 +2015,15 @@
               <node concept="2OqwBi" id="3KwBCAABqXV" role="2Oq$k0">
                 <node concept="1jxXqW" id="3KwBCAABq$t" role="2Oq$k0" />
                 <node concept="liA8E" id="3KwBCAABrtK" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                 </node>
               </node>
               <node concept="liA8E" id="3KwBCAABrOR" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
               </node>
             </node>
             <node concept="liA8E" id="3KwBCAABs8l" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.checkWriteAccess():void" resolve="checkWriteAccess" />
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkWriteAccess()" resolve="checkWriteAccess" />
             </node>
           </node>
         </node>
@@ -2043,7 +2043,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3KwBCAABwW0" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
               </node>
             </node>
           </node>
@@ -3319,7 +3319,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2dF51l1dtwt" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="37vLTw" id="2dF51l1dBeg" role="37wK5m">
                   <ref role="3cqZAo" node="2dF51l1d$S6" resolve="foo1" />
                 </node>
@@ -3399,7 +3399,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2dF51l1dNC$" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="37vLTw" id="2dF51l1dNHz" role="37wK5m">
                   <ref role="3cqZAo" node="2dF51l1dEVg" resolve="foo2" />
                 </node>
@@ -3757,7 +3757,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBzJKn" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBzLb3" role="37wK5m">
                   <ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBzLhd" role="37wK5m">
@@ -4017,7 +4017,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBGFuM" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBGFuN" role="37wK5m">
                   <ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBGFuO" role="37wK5m">
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd
index e3bcfdfc..de192d7f 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/jetbrains.mps.coderules.typechecking.ui.msd
@@ -37,7 +37,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
index 57c3d64a..fc9b7afd 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking.ui/models/jetbrains.mps.coderules.typechecking.ui.plugin.mps
@@ -9,7 +9,7 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
@@ -584,11 +584,11 @@
                   <ref role="3cqZAo" node="4n$QnzZQlSY" resolve="query" />
                 </node>
                 <node concept="liA8E" id="5mg4ZgLlR8i" role="2OqNvi">
-                  <ref role="37wK5l" to="9erk:~SearchQuery.getObjectHolder():jetbrains.mps.ide.findusages.model.holders.IHolder" resolve="getObjectHolder" />
+                  <ref role="37wK5l" to="9erk:~SearchQuery.getObjectHolder()" resolve="getObjectHolder" />
                 </node>
               </node>
               <node concept="liA8E" id="5mg4ZgLlR8j" role="2OqNvi">
-                <ref role="37wK5l" to="z3o9:~IHolder.getObject():java.lang.Object" resolve="getObject" />
+                <ref role="37wK5l" to="z3o9:~IHolder.getObject()" resolve="getObject" />
               </node>
             </node>
           </node>
@@ -645,13 +645,13 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="5mg4ZgLm5Sb" role="2OqNvi">
-                      <ref role="37wK5l" to="w1kc:~SNodePointer.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                      <ref role="37wK5l" to="w1kc:~SNodePointer.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                       <node concept="2OqwBi" id="5mg4ZgLm7jM" role="37wK5m">
                         <node concept="37vLTw" id="5mg4ZgLm6qZ" role="2Oq$k0">
                           <ref role="3cqZAo" node="6i42QSsghp4" resolve="mpsProject" />
                         </node>
                         <node concept="liA8E" id="5mg4ZgLm87g" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -734,13 +734,13 @@
                               <ref role="3cqZAo" node="6i42QSsgfqT" resolve="templateRef" />
                             </node>
                             <node concept="liA8E" id="6i42QSsgonT" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                              <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                               <node concept="2OqwBi" id="6i42QSsgjMy" role="37wK5m">
                                 <node concept="37vLTw" id="6i42QSsgiWf" role="2Oq$k0">
                                   <ref role="3cqZAo" node="6i42QSsghp4" resolve="mpsProject" />
                                 </node>
                                 <node concept="liA8E" id="6i42QSsgkvG" role="2OqNvi">
-                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                 </node>
                               </node>
                             </node>
@@ -792,7 +792,7 @@
             <node concept="1pGfFk" id="3YJ7yg2MRp0" role="2ShVmc">
               <ref role="37wK5l" to="9erk:~SearchResults.&lt;init&gt;(java.util.Collection,java.util.List)" resolve="SearchResults" />
               <node concept="2YIFZM" id="3YJ7yg2MyQB" role="37wK5m">
-                <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object):java.util.Set" resolve="singleton" />
+                <ref role="37wK5l" to="33ny:~Collections.singleton(java.lang.Object)" resolve="singleton" />
                 <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                 <node concept="37vLTw" id="3YJ7yg2Mztt" role="37wK5m">
                   <ref role="3cqZAo" node="4n$QnzZQnen" resolve="node" />
@@ -865,7 +865,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="6kREIVkWLqU" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
+                      <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="6kREIVkWNEh" role="37vLTJ">
@@ -883,7 +883,7 @@
               </node>
             </node>
             <node concept="liA8E" id="3YJ7yg2LGlJ" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -918,7 +918,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="443LGHBTXQ6" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
               </node>
@@ -1006,7 +1006,7 @@
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="6kREIVkXK5s" role="2OqNvi">
-                                            <ref role="37wK5l" to="z1c3:~Project.getScope():jetbrains.mps.project.Project$ProjectScope" resolve="getScope" />
+                                            <ref role="37wK5l" to="z1c3:~Project.getScope()" resolve="getScope" />
                                           </node>
                                         </node>
                                       </node>
@@ -1028,7 +1028,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="5upUcEtjHoz" role="2OqNvi">
-                                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                               </node>
                             </node>
                           </node>
@@ -1048,26 +1048,26 @@
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="6kREIVkX8wW" role="2OqNvi">
-                                        <ref role="37wK5l" to="ngmn:~UsageToolOptions.allowRunAgain(boolean):jetbrains.mps.ide.findusages.view.UsageToolOptions" resolve="allowRunAgain" />
+                                        <ref role="37wK5l" to="ngmn:~UsageToolOptions.allowRunAgain(boolean)" resolve="allowRunAgain" />
                                         <node concept="3clFbT" id="6kREIVkX8wX" role="37wK5m" />
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="6kREIVkX8wY" role="2OqNvi">
-                                      <ref role="37wK5l" to="ngmn:~UsageToolOptions.navigateIfSingle(boolean):jetbrains.mps.ide.findusages.view.UsageToolOptions" resolve="navigateIfSingle" />
+                                      <ref role="37wK5l" to="ngmn:~UsageToolOptions.navigateIfSingle(boolean)" resolve="navigateIfSingle" />
                                       <node concept="3clFbT" id="6kREIVkX8wZ" role="37wK5m">
                                         <property role="3clFbU" value="false" />
                                       </node>
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="6kREIVkX8x0" role="2OqNvi">
-                                    <ref role="37wK5l" to="ngmn:~UsageToolOptions.forceNewTab(boolean):jetbrains.mps.ide.findusages.view.UsageToolOptions" resolve="forceNewTab" />
+                                    <ref role="37wK5l" to="ngmn:~UsageToolOptions.forceNewTab(boolean)" resolve="forceNewTab" />
                                     <node concept="3clFbT" id="6kREIVkX8x1" role="37wK5m">
                                       <property role="3clFbU" value="false" />
                                     </node>
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="6kREIVkX8x2" role="2OqNvi">
-                                  <ref role="37wK5l" to="ngmn:~UsageToolOptions.notFoundMessage(java.lang.String):jetbrains.mps.ide.findusages.view.UsageToolOptions" resolve="notFoundMessage" />
+                                  <ref role="37wK5l" to="ngmn:~UsageToolOptions.notFoundMessage(java.lang.String)" resolve="notFoundMessage" />
                                   <node concept="Xl_RD" id="6kREIVkX8x3" role="37wK5m">
                                     <property role="Xl_RC" value="no applicable templates found" />
                                   </node>
@@ -1078,7 +1078,7 @@
                           <node concept="3clFbF" id="6kREIVkX8x4" role="3cqZAp">
                             <node concept="2YIFZM" id="6kREIVkX8x5" role="3clFbG">
                               <ref role="1Pybhc" to="ngmn:~UsagesViewTool" resolve="UsagesViewTool" />
-                              <ref role="37wK5l" to="ngmn:~UsagesViewTool.showUsages(com.intellij.openapi.project.Project,jetbrains.mps.ide.findusages.model.IResultProvider,jetbrains.mps.ide.findusages.model.SearchQuery,jetbrains.mps.ide.findusages.view.UsageToolOptions):void" resolve="showUsages" />
+                              <ref role="37wK5l" to="ngmn:~UsagesViewTool.showUsages(com.intellij.openapi.project.Project,jetbrains.mps.ide.findusages.model.IResultProvider,jetbrains.mps.ide.findusages.model.SearchQuery,jetbrains.mps.ide.findusages.view.UsageToolOptions)" resolve="showUsages" />
                               <node concept="2OqwBi" id="6kREIVkX8x6" role="37wK5m">
                                 <node concept="2WthIp" id="6kREIVkX8x7" role="2Oq$k0" />
                                 <node concept="1DTwFV" id="6kREIVkX8x8" role="2OqNvi">
@@ -1086,7 +1086,7 @@
                                 </node>
                               </node>
                               <node concept="2YIFZM" id="6kREIVkX8x9" role="37wK5m">
-                                <ref role="37wK5l" to="ngmm:~FindUtils.makeProvider(jetbrains.mps.ide.findusages.findalgorithm.finders.IFinder...):jetbrains.mps.ide.findusages.model.IResultProvider" resolve="makeProvider" />
+                                <ref role="37wK5l" to="ngmm:~FindUtils.makeProvider(jetbrains.mps.ide.findusages.findalgorithm.finders.IFinder...)" resolve="makeProvider" />
                                 <ref role="1Pybhc" to="ngmm:~FindUtils" resolve="FindUtils" />
                                 <node concept="37vLTw" id="6kREIVkXHO8" role="37wK5m">
                                   <ref role="3cqZAo" node="6kREIVkXHNZ" resolve="finder" />
@@ -1116,7 +1116,7 @@
                         <node concept="3clFbS" id="6kREIVkX8xr" role="3clF47">
                           <node concept="3clFbF" id="6kREIVkX8xs" role="3cqZAp">
                             <node concept="2YIFZM" id="6kREIVkX8xt" role="3clFbG">
-                              <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String):void" resolve="showWarningDialog" />
+                              <ref role="37wK5l" to="jkm4:~Messages.showWarningDialog(java.lang.String,java.lang.String)" resolve="showWarningDialog" />
                               <ref role="1Pybhc" to="jkm4:~Messages" resolve="Messages" />
                               <node concept="37vLTw" id="6kREIVkX8xu" role="37wK5m">
                                 <ref role="3cqZAo" node="6kREIVkX8xn" resolve="message" />
@@ -1158,7 +1158,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3YJ7yg2LDWD" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
+                <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
               </node>
             </node>
           </node>
@@ -1173,7 +1173,7 @@
             </node>
             <node concept="2YIFZM" id="3YJ7yg2LDWJ" role="33vP2m">
               <ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
-              <ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel):java.util.Set" resolve="getAllLanguageImports" />
+              <ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel)" resolve="getAllLanguageImports" />
               <node concept="2OqwBi" id="3YJ7yg2LDWK" role="37wK5m">
                 <node concept="37vLTw" id="3YJ7yg2LDWL" role="2Oq$k0">
                   <ref role="3cqZAo" node="3YJ7yg2LDWz" resolve="containingRoot" />
@@ -1211,7 +1211,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="3GlpCDS_tAo" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                             </node>
                           </node>
                         </node>
@@ -1345,7 +1345,7 @@
               <ref role="3cqZAo" node="Hg6EncbkRS" resolve="prevStep" />
             </node>
             <node concept="liA8E" id="5lxnBcU085M" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function):io.reactivex.Single" resolve="flatMap" />
+              <ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function)" resolve="flatMap" />
               <node concept="1bVj0M" id="5lxnBcU08CP" role="37wK5m">
                 <node concept="37vLTG" id="5lxnBcU09rm" role="1bW2Oz">
                   <property role="TrG5h" value="prev" />
@@ -1372,7 +1372,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="78H58of3fKh" role="2OqNvi">
-                              <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
+                              <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
                             </node>
                           </node>
                           <node concept="2OqwBi" id="78H58of3fKi" role="37wK5m">
@@ -1471,9 +1471,9 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="5lxnBcU0eq5" role="2OqNvi">
-                        <ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource):io.reactivex.Single" resolve="andThen" />
+                        <ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource)" resolve="andThen" />
                         <node concept="2YIFZM" id="5lxnBcU0gP7" role="37wK5m">
-                          <ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable):io.reactivex.Single" resolve="fromCallable" />
+                          <ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable)" resolve="fromCallable" />
                           <ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
                           <node concept="1bVj0M" id="5lxnBcU0iBX" role="37wK5m">
                             <node concept="3clFbS" id="5lxnBcU0iBY" role="1bW5cS">
@@ -1548,7 +1548,7 @@
               <ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
             </node>
             <node concept="liA8E" id="443LGHBSEHm" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -1581,7 +1581,7 @@
                   <ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
                 </node>
                 <node concept="liA8E" id="6kREIVkONuP" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c4:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                  <ref role="37wK5l" to="z1c4:~MPSProject.getProject()" resolve="getProject" />
                 </node>
               </node>
             </node>
@@ -1649,15 +1649,15 @@
                   <ref role="3cqZAo" node="Hg6Enc6phb" resolve="prevStep" />
                 </node>
                 <node concept="liA8E" id="Hg6EncXnuT" role="2OqNvi">
-                  <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
+                  <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
                   <node concept="2YIFZM" id="Hg6EncXnuU" role="37wK5m">
                     <ref role="1Pybhc" to="f4yq:~SwingSchedulers" resolve="SwingSchedulers" />
-                    <ref role="37wK5l" to="f4yq:~SwingSchedulers.edt():io.reactivex.Scheduler" resolve="edt" />
+                    <ref role="37wK5l" to="f4yq:~SwingSchedulers.edt()" resolve="edt" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="Hg6EncXntX" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+                <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
                 <node concept="1bVj0M" id="Hg6EncXntY" role="37wK5m">
                   <node concept="37vLTG" id="Hg6EncXntZ" role="1bW2Oz">
                     <property role="TrG5h" value="prev" />
@@ -1725,7 +1725,7 @@
                                 <ref role="3cqZAo" node="Hg6EncXnu8" resolve="program" />
                               </node>
                               <node concept="liA8E" id="6IQb_Rxph$L" role="2OqNvi">
-                                <ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
+                                <ref role="37wK5l" to="av0y:~Program.name()" resolve="name" />
                               </node>
                             </node>
                           </node>
@@ -1841,7 +1841,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6IQb_Rxsum7" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.doFinally(io.reactivex.functions.Action):io.reactivex.Single" resolve="doFinally" />
+              <ref role="37wK5l" to="unkn:~Single.doFinally(io.reactivex.functions.Action)" resolve="doFinally" />
               <node concept="1bVj0M" id="6IQb_Rxswo2" role="37wK5m">
                 <node concept="3clFbS" id="6IQb_Rxswo3" role="1bW5cS">
                   <node concept="3clFbH" id="6IQb_Rxsy3D" role="3cqZAp" />
@@ -1920,7 +1920,7 @@
                         <ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
                       </node>
                       <node concept="liA8E" id="6IQb_Rxsy6n" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
                   </node>
@@ -2011,7 +2011,7 @@
             <node concept="3Tqbb2" id="6hqFpWnfbDz" role="1tU5fm" />
             <node concept="2OqwBi" id="6hqFpWnfbD$" role="33vP2m">
               <node concept="liA8E" id="6hqFpWnfbDC" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
+                <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
               </node>
               <node concept="37vLTw" id="6hqFpWnfcn_" role="2Oq$k0">
                 <ref role="3cqZAo" node="6hqFpWnfbqG" resolve="node" />
@@ -2041,7 +2041,7 @@
                   <ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
                 </node>
                 <node concept="liA8E" id="7WKNeR8ULi8" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                 </node>
               </node>
             </node>
@@ -2071,7 +2071,7 @@
                     <ref role="3cqZAo" node="6hqFpWnfcD1" resolve="editorComponent" />
                   </node>
                   <node concept="liA8E" id="6hqFpWnfbEg" role="2OqNvi">
-                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
+                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
                   </node>
                 </node>
               </node>
@@ -2555,7 +2555,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4vBwiiVz_Wc" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                 </node>
               </node>
             </node>
@@ -2641,7 +2641,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="6kEuCh$5LeT" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                      <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="4vBwiiVAn8l" role="37wK5m">
@@ -2690,13 +2690,13 @@
                                     <node concept="2OqwBi" id="4vBwiiVz_Xj" role="3clFbG">
                                       <node concept="2YIFZM" id="4vBwiiVz_Xk" role="2Oq$k0">
                                         <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
                                         <node concept="37vLTw" id="4vBwiiVz_Xl" role="37wK5m">
                                           <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="4vBwiiVz_Xm" role="2OqNvi">
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
                                         <node concept="Xl_RD" id="4vBwiiVz_Xn" role="37wK5m">
                                           <property role="Xl_RC" value="Activation Trace" />
                                         </node>
@@ -2717,7 +2717,7 @@
                                   <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                                 </node>
                                 <node concept="liA8E" id="4vBwiiVz_Xs" role="2OqNvi">
-                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                 </node>
                               </node>
                             </node>
@@ -2740,13 +2740,13 @@
                                     <node concept="2OqwBi" id="4vBwiiVz_XB" role="3clFbG">
                                       <node concept="2YIFZM" id="4vBwiiVz_XC" role="2Oq$k0">
                                         <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
                                         <node concept="37vLTw" id="4vBwiiVz_XD" role="37wK5m">
                                           <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="4vBwiiVz_XE" role="2OqNvi">
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
                                         <node concept="Xl_RD" id="4vBwiiVz_XF" role="37wK5m">
                                           <property role="Xl_RC" value="Activation Trace" />
                                         </node>
@@ -2767,7 +2767,7 @@
                                   <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                                 </node>
                                 <node concept="liA8E" id="4vBwiiVz_XK" role="2OqNvi">
-                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                 </node>
                               </node>
                             </node>
@@ -2888,7 +2888,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="7WKNeR8SQxO" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                 </node>
               </node>
             </node>
@@ -3026,13 +3026,13 @@
                                     <node concept="2OqwBi" id="7WKNeR8SQyQ" role="3clFbG">
                                       <node concept="2YIFZM" id="7WKNeR8SQyR" role="2Oq$k0">
                                         <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
                                         <node concept="37vLTw" id="7WKNeR8SQyS" role="37wK5m">
                                           <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="7WKNeR8SQyT" role="2OqNvi">
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
                                         <node concept="Xl_RD" id="7WKNeR8SQyU" role="37wK5m">
                                           <property role="Xl_RC" value="Activation Trace" />
                                         </node>
@@ -3053,7 +3053,7 @@
                                   <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                                 </node>
                                 <node concept="liA8E" id="7WKNeR8SQyZ" role="2OqNvi">
-                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                 </node>
                               </node>
                             </node>
@@ -3076,13 +3076,13 @@
                                     <node concept="2OqwBi" id="7WKNeR8SQza" role="3clFbG">
                                       <node concept="2YIFZM" id="7WKNeR8SQzb" role="2Oq$k0">
                                         <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
                                         <node concept="37vLTw" id="7WKNeR8SQzc" role="37wK5m">
                                           <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="7WKNeR8SQzd" role="2OqNvi">
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
                                         <node concept="Xl_RD" id="7WKNeR8SQze" role="37wK5m">
                                           <property role="Xl_RC" value="Activation Trace" />
                                         </node>
@@ -3103,7 +3103,7 @@
                                   <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                                 </node>
                                 <node concept="liA8E" id="7WKNeR8SQzj" role="2OqNvi">
-                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                 </node>
                               </node>
                             </node>
@@ -3410,15 +3410,15 @@
                 <ref role="3cqZAo" node="4vBwiiV$adz" resolve="prevStep" />
               </node>
               <node concept="liA8E" id="6kEuCh$3Be5" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
+                <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
                 <node concept="2YIFZM" id="6kEuCh$3DmD" role="37wK5m">
-                  <ref role="37wK5l" to="f4yq:~SwingSchedulers.edt():io.reactivex.Scheduler" resolve="edt" />
+                  <ref role="37wK5l" to="f4yq:~SwingSchedulers.edt()" resolve="edt" />
                   <ref role="1Pybhc" to="f4yq:~SwingSchedulers" resolve="SwingSchedulers" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="4vBwiiV$cFS" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="4vBwiiV$df1" role="37wK5m">
                 <node concept="3clFbS" id="4vBwiiV$df2" role="1bW5cS">
                   <node concept="3cpWs8" id="4vBwiiV$vTm" role="3cqZAp">
@@ -3473,7 +3473,7 @@
                                             <ref role="3cqZAo" node="4vBwiiV$7vt" resolve="mpsProject" />
                                           </node>
                                           <node concept="liA8E" id="4vBwiiVAGlp" role="2OqNvi">
-                                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                           </node>
                                         </node>
                                       </node>
@@ -3492,11 +3492,11 @@
                                           <ref role="3cqZAo" node="4vBwiiV$vTt" resolve="renderComponent" />
                                         </node>
                                         <node concept="liA8E" id="4vBwiiV$vTP" role="2OqNvi">
-                                          <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell():jetbrains.mps.nodeEditor.cells.EditorCell" resolve="getRootCell" />
+                                          <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="4vBwiiV$vTQ" role="2OqNvi">
-                                        <ref role="37wK5l" to="f4zo:~EditorCell.renderText():jetbrains.mps.openapi.editor.TextBuilder" resolve="renderText" />
+                                        <ref role="37wK5l" to="f4zo:~EditorCell.renderText()" resolve="renderText" />
                                       </node>
                                     </node>
                                   </node>
@@ -3517,19 +3517,19 @@
                                                     <ref role="3cqZAo" node="4vBwiiV$vTK" resolve="renderText" />
                                                   </node>
                                                   <node concept="liA8E" id="4vBwiiV$vU2" role="2OqNvi">
-                                                    <ref role="37wK5l" to="cj4x:~TextBuilder.getLines():java.lang.Iterable" resolve="getLines" />
+                                                    <ref role="37wK5l" to="cj4x:~TextBuilder.getLines()" resolve="getLines" />
                                                   </node>
                                                 </node>
                                                 <node concept="liA8E" id="4vBwiiV$vU3" role="2OqNvi">
-                                                  <ref role="37wK5l" to="wyt6:~Iterable.iterator():java.util.Iterator" resolve="iterator" />
+                                                  <ref role="37wK5l" to="wyt6:~Iterable.iterator()" resolve="iterator" />
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="4vBwiiV$vU4" role="2OqNvi">
-                                                <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                                                <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="4vBwiiV$vU5" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~CharSequence.toString():java.lang.String" resolve="toString" />
+                                              <ref role="37wK5l" to="wyt6:~CharSequence.toString()" resolve="toString" />
                                             </node>
                                           </node>
                                         </node>
@@ -3548,7 +3548,7 @@
                                         <ref role="3cqZAo" node="4vBwiiV$vTK" resolve="renderText" />
                                       </node>
                                       <node concept="liA8E" id="4vBwiiV$vUb" role="2OqNvi">
-                                        <ref role="37wK5l" to="cj4x:~TextBuilder.getSize():int" resolve="getSize" />
+                                        <ref role="37wK5l" to="cj4x:~TextBuilder.getSize()" resolve="getSize" />
                                       </node>
                                     </node>
                                   </node>
@@ -3561,7 +3561,7 @@
                                               <ref role="3cqZAo" node="4vBwiiV$vTK" resolve="renderText" />
                                             </node>
                                             <node concept="liA8E" id="4vBwiiV$vUi" role="2OqNvi">
-                                              <ref role="37wK5l" to="cj4x:~TextBuilder.getText():java.lang.String" resolve="getText" />
+                                              <ref role="37wK5l" to="cj4x:~TextBuilder.getText()" resolve="getText" />
                                             </node>
                                           </node>
                                           <node concept="37vLTw" id="4vBwiiV$vUj" role="37vLTJ">
@@ -3578,7 +3578,7 @@
                                       <ref role="3cqZAo" node="4vBwiiV$vTt" resolve="renderComponent" />
                                     </node>
                                     <node concept="liA8E" id="4vBwiiV$vUn" role="2OqNvi">
-                                      <ref role="37wK5l" to="exr9:~EditorComponent.dispose():void" resolve="dispose" />
+                                      <ref role="37wK5l" to="exr9:~EditorComponent.dispose()" resolve="dispose" />
                                     </node>
                                   </node>
                                 </node>
@@ -3597,7 +3597,7 @@
                             <ref role="3cqZAo" node="4vBwiiV$7vt" resolve="mpsProject" />
                           </node>
                           <node concept="liA8E" id="4vBwiiV$vp0" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -3625,7 +3625,7 @@
                                 <ref role="3cqZAo" node="4vBwiiV$7my" resolve="editorCell" />
                               </node>
                               <node concept="liA8E" id="4vBwiiV_hTu" role="2OqNvi">
-                                <ref role="37wK5l" to="f4zo:~EditorCell.getX():int" resolve="getX" />
+                                <ref role="37wK5l" to="f4zo:~EditorCell.getX()" resolve="getX" />
                               </node>
                             </node>
                             <node concept="1eOMI4" id="4vBwiiV_hTv" role="3uHU7w">
@@ -3638,7 +3638,7 @@
                                     <ref role="3cqZAo" node="4vBwiiV$7my" resolve="editorCell" />
                                   </node>
                                   <node concept="liA8E" id="4vBwiiV_hTA" role="2OqNvi">
-                                    <ref role="37wK5l" to="f4zo:~EditorCell.getWidth():int" resolve="getWidth" />
+                                    <ref role="37wK5l" to="f4zo:~EditorCell.getWidth()" resolve="getWidth" />
                                   </node>
                                 </node>
                               </node>
@@ -3649,7 +3649,7 @@
                               <ref role="3cqZAo" node="4vBwiiV$7my" resolve="editorCell" />
                             </node>
                             <node concept="liA8E" id="4vBwiiV_hTF" role="2OqNvi">
-                              <ref role="37wK5l" to="f4zo:~EditorCell.getY():int" resolve="getY" />
+                              <ref role="37wK5l" to="f4zo:~EditorCell.getY()" resolve="getY" />
                             </node>
                           </node>
                         </node>
@@ -3685,11 +3685,11 @@
                       <node concept="2OqwBi" id="4vBwiiV_rfN" role="33vP2m">
                         <node concept="2OqwBi" id="4vBwiiV_rfO" role="2Oq$k0">
                           <node concept="2YIFZM" id="4vBwiiV_rfP" role="2Oq$k0">
-                            <ref role="37wK5l" to="gspm:~JBPopupFactory.getInstance():com.intellij.openapi.ui.popup.JBPopupFactory" resolve="getInstance" />
+                            <ref role="37wK5l" to="gspm:~JBPopupFactory.getInstance()" resolve="getInstance" />
                             <ref role="1Pybhc" to="gspm:~JBPopupFactory" resolve="JBPopupFactory" />
                           </node>
                           <node concept="liA8E" id="4vBwiiV_rfQ" role="2OqNvi">
-                            <ref role="37wK5l" to="gspm:~JBPopupFactory.createHtmlTextBalloonBuilder(java.lang.String,javax.swing.Icon,java.awt.Color,javax.swing.event.HyperlinkListener):com.intellij.openapi.ui.popup.BalloonBuilder" resolve="createHtmlTextBalloonBuilder" />
+                            <ref role="37wK5l" to="gspm:~JBPopupFactory.createHtmlTextBalloonBuilder(java.lang.String,javax.swing.Icon,java.awt.Color,javax.swing.event.HyperlinkListener)" resolve="createHtmlTextBalloonBuilder" />
                             <node concept="2YIFZM" id="6Yb9hAqy3Rf" role="37wK5m">
                               <ref role="37wK5l" to="o35r:4vBwiiVrVPy" resolve="escapeHtml" />
                               <ref role="1Pybhc" to="o35r:4vBwiiVrUlG" resolve="HtmlUtil" />
@@ -3704,14 +3704,14 @@
                                 <ref role="1PxDUh" to="jkm4:~MessageType" resolve="MessageType" />
                               </node>
                               <node concept="liA8E" id="4vBwiiV_rfW" role="2OqNvi">
-                                <ref role="37wK5l" to="jkm4:~MessageType.getPopupBackground():java.awt.Color" resolve="getPopupBackground" />
+                                <ref role="37wK5l" to="jkm4:~MessageType.getPopupBackground()" resolve="getPopupBackground" />
                               </node>
                             </node>
                             <node concept="10Nm6u" id="4vBwiiV_rfX" role="37wK5m" />
                           </node>
                         </node>
                         <node concept="liA8E" id="4vBwiiV_rfY" role="2OqNvi">
-                          <ref role="37wK5l" to="gspm:~BalloonBuilder.createBalloon():com.intellij.openapi.ui.popup.Balloon" resolve="createBalloon" />
+                          <ref role="37wK5l" to="gspm:~BalloonBuilder.createBalloon()" resolve="createBalloon" />
                         </node>
                       </node>
                     </node>
@@ -3719,7 +3719,7 @@
                   <node concept="3clFbF" id="4vBwiiV_rgb" role="3cqZAp">
                     <node concept="2YIFZM" id="4vBwiiV_rgc" role="3clFbG">
                       <ref role="1Pybhc" to="zn9m:~Disposer" resolve="Disposer" />
-                      <ref role="37wK5l" to="zn9m:~Disposer.register(com.intellij.openapi.Disposable,com.intellij.openapi.Disposable):void" resolve="register" />
+                      <ref role="37wK5l" to="zn9m:~Disposer.register(com.intellij.openapi.Disposable,com.intellij.openapi.Disposable)" resolve="register" />
                       <node concept="37vLTw" id="4vBwiiVAzjK" role="37wK5m">
                         <ref role="3cqZAo" node="4vBwiiVAxqo" resolve="ideaProject" />
                       </node>
@@ -3734,7 +3734,7 @@
                         <ref role="3cqZAo" node="4vBwiiV_rfL" resolve="balloon" />
                       </node>
                       <node concept="liA8E" id="4vBwiiV_rgk" role="2OqNvi">
-                        <ref role="37wK5l" to="gspm:~Balloon.show(com.intellij.ui.awt.RelativePoint,com.intellij.openapi.ui.popup.Balloon$Position):void" resolve="show" />
+                        <ref role="37wK5l" to="gspm:~Balloon.show(com.intellij.ui.awt.RelativePoint,com.intellij.openapi.ui.popup.Balloon$Position)" resolve="show" />
                         <node concept="37vLTw" id="4vBwiiV_rgl" role="37wK5m">
                           <ref role="3cqZAo" node="4vBwiiV_o9b" resolve="relPoint" />
                         </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
index 2c1b46e7..c48b5039 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/jetbrains.mps.coderules.typechecking.msd
@@ -34,14 +34,15 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
-    <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
+    <module reference="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86(Hamcrest)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" version="0" />
     <module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
     <module reference="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
     <module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
index 9c47cd09..1202d465 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
index 0bdb622e..8768b798 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.plugin.mps
@@ -6,7 +6,7 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index 6858b5cd..72a89615 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -5,7 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="-1" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -705,7 +705,7 @@
                   <ref role="3cqZAo" node="27bTNFfaZ1g" resolve="project" />
                 </node>
                 <node concept="liA8E" id="27bTNFfaZ1q" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                 </node>
               </node>
             </node>
@@ -929,7 +929,7 @@
                             <ref role="3cqZAo" node="27bTNFfaZ4f" resolve="it" />
                           </node>
                           <node concept="liA8E" id="27bTNFfaZ2R" role="2OqNvi">
-                            <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
+                            <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity()" resolve="getSeverity" />
                           </node>
                         </node>
                         <node concept="Rm8GO" id="27bTNFfaZ2S" role="3uHU7B">
@@ -972,7 +972,7 @@
                                       <ref role="3cqZAo" node="27bTNFfaZ4f" resolve="it" />
                                     </node>
                                     <node concept="liA8E" id="27bTNFfaZ3a" role="2OqNvi">
-                                      <ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
+                                      <ref role="37wK5l" to="d6hs:~ReportItem.getMessage()" resolve="getMessage" />
                                     </node>
                                   </node>
                                   <node concept="37vLTw" id="27bTNFfaZ3b" role="37wK5m">
@@ -1045,7 +1045,7 @@
                                       <ref role="3cqZAo" node="27bTNFfaZ3m" resolve="tri" />
                                     </node>
                                     <node concept="liA8E" id="4ZGicUZ7Icz" role="2OqNvi">
-                                      <ref role="37wK5l" to="d6hs:~NodeReportItemBase.getNode():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getNode" />
+                                      <ref role="37wK5l" to="d6hs:~NodeReportItemBase.getNode()" resolve="getNode" />
                                     </node>
                                   </node>
                                 </node>
@@ -1083,7 +1083,7 @@
                                         <ref role="37wK5l" to="wyt6:~AssertionError.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="AssertionError" />
                                         <node concept="2YIFZM" id="27bTNFfaZ3S" role="37wK5m">
                                           <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                          <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                                          <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                                           <node concept="Xl_RD" id="27bTNFfaZ3T" role="37wK5m">
                                             <property role="Xl_RC" value="Unadvised error in '%s': %s" />
                                           </node>
@@ -1095,7 +1095,7 @@
                                               <ref role="3cqZAo" node="27bTNFfaZ3m" resolve="tri" />
                                             </node>
                                             <node concept="liA8E" id="27bTNFfaZ3Z" role="2OqNvi">
-                                              <ref role="37wK5l" to="d6hs:~ReportItemBase.getMessage():java.lang.String" resolve="getMessage" />
+                                              <ref role="37wK5l" to="d6hs:~ReportItemBase.getMessage()" resolve="getMessage" />
                                             </node>
                                           </node>
                                         </node>
@@ -1220,7 +1220,7 @@
                         <node concept="1pGfFk" id="27bTNFfaZ4L" role="2ShVmc">
                           <ref role="37wK5l" to="wyt6:~RuntimeException.&lt;init&gt;(java.lang.String)" resolve="RuntimeException" />
                           <node concept="2YIFZM" id="27bTNFfaZ4M" role="37wK5m">
-                            <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                            <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                             <node concept="Xl_RD" id="27bTNFfaZ4N" role="37wK5m">
                               <property role="Xl_RC" value="Advised error not triggered in '%s'" />
@@ -1307,7 +1307,7 @@
                                 <node concept="1pGfFk" id="4ZGicUZbjmh" role="2ShVmc">
                                   <ref role="37wK5l" to="wyt6:~AssertionError.&lt;init&gt;(java.lang.Object)" resolve="AssertionError" />
                                   <node concept="2YIFZM" id="27bTNFfaZ5l" role="37wK5m">
-                                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                                     <node concept="Xl_RD" id="27bTNFfaZ5m" role="37wK5m">
                                       <property role="Xl_RC" value="Error type of [%s]: [%s]" />
@@ -1698,14 +1698,14 @@
                     <ref role="3cqZAo" node="4ZGicUZ5lIf" resolve="res" />
                   </node>
                   <node concept="liA8E" id="4ZGicUZ5t2m" role="2OqNvi">
-                    <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
+                    <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
                     <node concept="22lmx$" id="4ZGicUZc8bB" role="37wK5m">
                       <node concept="2OqwBi" id="4ZGicUZ5Bg1" role="3uHU7B">
                         <node concept="37vLTw" id="4ZGicUZ5Bg2" role="2Oq$k0">
                           <ref role="3cqZAo" node="4ZGicUZ3AX0" resolve="modifier" />
                         </node>
                         <node concept="liA8E" id="4ZGicUZ5Bg3" role="2OqNvi">
-                          <ref role="37wK5l" to="ggp6:~IMatchModifier.accept(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode):boolean" resolve="accept" />
+                          <ref role="37wK5l" to="ggp6:~IMatchModifier.accept(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode)" resolve="accept" />
                           <node concept="37vLTw" id="4ZGicUZ5Bg4" role="37wK5m">
                             <ref role="3cqZAo" node="4ZGicUZ1iVl" resolve="a" />
                           </node>
@@ -1716,7 +1716,7 @@
                       </node>
                       <node concept="2YIFZM" id="4ZGicUZ5tno" role="3uHU7w">
                         <ref role="1Pybhc" to="ggp6:~MatchingUtil" resolve="MatchingUtil" />
-                        <ref role="37wK5l" to="ggp6:~MatchingUtil.matchNodes(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.lang.pattern.util.IMatchModifier,boolean):boolean" resolve="matchNodes" />
+                        <ref role="37wK5l" to="ggp6:~MatchingUtil.matchNodes(org.jetbrains.mps.openapi.model.SNode,org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.lang.pattern.util.IMatchModifier,boolean)" resolve="matchNodes" />
                         <node concept="37vLTw" id="4ZGicUZ5tnp" role="37wK5m">
                           <ref role="3cqZAo" node="4ZGicUZ1iVl" resolve="a" />
                         </node>
@@ -1750,7 +1750,7 @@
                       <ref role="3cqZAo" node="4ZGicUZ5lIf" resolve="res" />
                     </node>
                     <node concept="liA8E" id="4ZGicUZ5vHH" role="2OqNvi">
-                      <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
+                      <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
                       <node concept="3clFbT" id="4ZGicUZ5vRu" role="37wK5m" />
                     </node>
                   </node>
@@ -1761,13 +1761,13 @@
                       <ref role="3cqZAo" node="4ZGicUZ6gps" resolve="details" />
                     </node>
                     <node concept="liA8E" id="4ZGicUZ6o20" role="2OqNvi">
-                      <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
+                      <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
                       <node concept="2OqwBi" id="4ZGicUZ6oHB" role="37wK5m">
                         <node concept="37vLTw" id="4ZGicUZ6ojL" role="2Oq$k0">
                           <ref role="3cqZAo" node="4ZGicUZ5dnL" resolve="cme" />
                         </node>
                         <node concept="liA8E" id="4ZGicUZ6pq1" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                          <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                         </node>
                       </node>
                     </node>
@@ -1783,7 +1783,7 @@
                   <property role="TrG5h" value="msg" />
                   <node concept="17QB3L" id="4ZGicUZ6838" role="1tU5fm" />
                   <node concept="2YIFZM" id="4ZGicUZ5ZbB" role="33vP2m">
-                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="Xl_RD" id="4ZGicUZ5ZbC" role="37wK5m">
                       <property role="Xl_RC" value="types of [%s] differ: [%s] and [%s] %s" />
@@ -1802,7 +1802,7 @@
                         <ref role="3cqZAo" node="4ZGicUZ6gps" resolve="details" />
                       </node>
                       <node concept="liA8E" id="4ZGicUZ6twv" role="2OqNvi">
-                        <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                        <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
                       </node>
                     </node>
                   </node>
@@ -1814,7 +1814,7 @@
                   <node concept="3clFbF" id="4ZGicUZ5$_t" role="3cqZAp">
                     <node concept="2YIFZM" id="4ZGicUZ5_Qf" role="3clFbG">
                       <ref role="1Pybhc" to="rjhg:~Assert" resolve="Assert" />
-                      <ref role="37wK5l" to="rjhg:~Assert.fail(java.lang.String):void" resolve="fail" />
+                      <ref role="37wK5l" to="rjhg:~Assert.fail(java.lang.String)" resolve="fail" />
                       <node concept="37vLTw" id="4ZGicUZ5ZBH" role="37wK5m">
                         <ref role="3cqZAo" node="4ZGicUZ5ZbA" resolve="msg" />
                       </node>
@@ -1843,7 +1843,7 @@
                   <ref role="3cqZAo" node="4ZGicUZ5lIf" resolve="res" />
                 </node>
                 <node concept="liA8E" id="4ZGicUZ5z$Z" role="2OqNvi">
-                  <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
                 </node>
               </node>
             </node>
@@ -3451,7 +3451,7 @@
               <ref role="3cqZAo" node="HOeeeUbp7P" resolve="prevStep" />
             </node>
             <node concept="liA8E" id="HOeeeUbqUm" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="HOeeeUbrlt" role="37wK5m">
                 <node concept="37vLTG" id="HOeeeUbrCB" role="1bW2Oz">
                   <property role="TrG5h" value="prev" />
@@ -3468,11 +3468,11 @@
                         <node concept="3clFbF" id="HOeeeUbzU4" role="3cqZAp">
                           <node concept="2OqwBi" id="HOeeeUb$tE" role="3clFbG">
                             <node concept="2YIFZM" id="HOeeeUb$e9" role="2Oq$k0">
-                              <ref role="37wK5l" to="u78q:~TypeContextManager.getInstance():jetbrains.mps.typesystem.inference.TypeContextManager" resolve="getInstance" />
+                              <ref role="37wK5l" to="u78q:~TypeContextManager.getInstance()" resolve="getInstance" />
                               <ref role="1Pybhc" to="u78q:~TypeContextManager" resolve="TypeContextManager" />
                             </node>
                             <node concept="liA8E" id="HOeeeUb$He" role="2OqNvi">
-                              <ref role="37wK5l" to="u78q:~TypeContextManager.runTypeCheckingAction(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.ITypechecking$Action):void" resolve="runTypeCheckingAction" />
+                              <ref role="37wK5l" to="u78q:~TypeContextManager.runTypeCheckingAction(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.typesystem.inference.ITypechecking$Action)" resolve="runTypeCheckingAction" />
                               <node concept="37vLTw" id="HOeeeUb_1L" role="37wK5m">
                                 <ref role="3cqZAo" node="HOeeeUbutz" resolve="node" />
                               </node>
@@ -3491,7 +3491,7 @@
                                         <ref role="3cqZAo" node="HOeeeUbBLc" resolve="context" />
                                       </node>
                                       <node concept="liA8E" id="HOeeeUbDwZ" role="2OqNvi">
-                                        <ref role="37wK5l" to="u78q:~TypeCheckingContext.checkIfNotChecked(org.jetbrains.mps.openapi.model.SNode,boolean):boolean" resolve="checkIfNotChecked" />
+                                        <ref role="37wK5l" to="u78q:~TypeCheckingContext.checkIfNotChecked(org.jetbrains.mps.openapi.model.SNode,boolean)" resolve="checkIfNotChecked" />
                                         <node concept="37vLTw" id="HOeeeUbDJH" role="37wK5m">
                                           <ref role="3cqZAo" node="HOeeeUbutz" resolve="node" />
                                         </node>
@@ -3614,7 +3614,7 @@
               </node>
             </node>
             <node concept="liA8E" id="78H58of4NWJ" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="78H58of4P00" role="37wK5m">
                 <node concept="3clFbS" id="78H58of4P01" role="1bW5cS">
                   <node concept="3clFbH" id="78H58of6jpm" role="3cqZAp" />
@@ -3684,7 +3684,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="oI9YrbF6w" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                             </node>
                           </node>
                           <node concept="37vLTw" id="oI9YrbBkn" role="3ElQJh">
@@ -4197,11 +4197,11 @@
                 </node>
               </node>
               <node concept="liA8E" id="1FOQehxpDnr" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
               </node>
             </node>
             <node concept="liA8E" id="1FOQehxpDns" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
             </node>
           </node>
         </node>
@@ -4353,11 +4353,11 @@
                 <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
               </node>
               <node concept="liA8E" id="1FOQehxe0t5" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
               </node>
             </node>
             <node concept="liA8E" id="1FOQehxe0t6" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
             </node>
           </node>
         </node>
@@ -4418,7 +4418,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="1FOQehxe23j" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                   </node>
                 </node>
                 <node concept="1bVj0M" id="1FOQehxe23k" role="37wK5m">
@@ -4502,11 +4502,11 @@
                 <ref role="3cqZAo" node="3IIf9O_u8qV" resolve="repository" />
               </node>
               <node concept="liA8E" id="1FOQehxnAVG" role="2OqNvi">
-                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                <ref role="37wK5l" to="lui2:~SRepository.getModelAccess()" resolve="getModelAccess" />
               </node>
             </node>
             <node concept="liA8E" id="1FOQehxnAVH" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
             </node>
           </node>
         </node>
@@ -4865,7 +4865,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="1FOQehxoN4F" role="2OqNvi">
-                    <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
+                    <ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
                   </node>
                 </node>
               </node>
@@ -4916,7 +4916,7 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="1FOQehxoVgF" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                          <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="2Qe6u2c8pSd" role="3ElQJh">
@@ -5068,7 +5068,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3IIf9O_qVuh" role="2OqNvi">
-                    <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
+                    <ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
                   </node>
                 </node>
               </node>
@@ -5253,7 +5253,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3IIf9OAgx80" role="2OqNvi">
-                    <ref role="37wK5l" to="unkn:~Single.blockingGet():java.lang.Object" resolve="blockingGet" />
+                    <ref role="37wK5l" to="unkn:~Single.blockingGet()" resolve="blockingGet" />
                   </node>
                 </node>
               </node>
@@ -5560,7 +5560,7 @@
             <node concept="3cpWs6" id="3IIf9O_tJHF" role="3cqZAp">
               <node concept="2YIFZM" id="3IIf9O_tQ$z" role="3cqZAk">
                 <ref role="1Pybhc" to="w1kc:~MPSModuleRepository" resolve="MPSModuleRepository" />
-                <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance():jetbrains.mps.smodel.MPSModuleRepository" resolve="getInstance" />
+                <ref role="37wK5l" to="w1kc:~MPSModuleRepository.getInstance()" resolve="getInstance" />
               </node>
             </node>
             <node concept="3clFbH" id="3IIf9O_tRfg" role="3cqZAp" />
@@ -5580,7 +5580,7 @@
               </node>
             </node>
             <node concept="liA8E" id="3IIf9O_tJHO" role="2OqNvi">
-              <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -5682,7 +5682,7 @@
               </node>
             </node>
             <node concept="liA8E" id="4t7Xo7iw0Kl" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
               <node concept="37vLTw" id="4t7Xo7iw11c" role="37wK5m">
                 <ref role="3cqZAo" node="4t7Xo7ivP5g" resolve="fqName" />
               </node>
@@ -5707,7 +5707,7 @@
               </node>
             </node>
             <node concept="liA8E" id="4t7Xo7iw1yk" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
               <node concept="37vLTw" id="4t7Xo7iw1yl" role="37wK5m">
                 <ref role="3cqZAo" node="4t7Xo7ivP5g" resolve="fqName" />
               </node>
@@ -5777,14 +5777,14 @@
               <node concept="2OqwBi" id="4t7Xo7ivWyB" role="3uHU7B">
                 <node concept="2OqwBi" id="2Mi2iz0Yf4b" role="2Oq$k0">
                   <node concept="1rXfSq" id="4t7Xo7ivWek" role="2Oq$k0">
-                    <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                    <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                   </node>
                   <node concept="liA8E" id="2Mi2iz0YfRL" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Class.getPackage():java.lang.Package" resolve="getPackage" />
+                    <ref role="37wK5l" to="wyt6:~Class.getPackage()" resolve="getPackage" />
                   </node>
                 </node>
                 <node concept="liA8E" id="4t7Xo7ivWVU" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Package.getName():java.lang.String" resolve="getName" />
+                  <ref role="37wK5l" to="wyt6:~Package.getName()" resolve="getName" />
                 </node>
               </node>
               <node concept="Xl_RD" id="4t7Xo7ivXoD" role="3uHU7w">
@@ -5919,7 +5919,7 @@
               <ref role="3cqZAo" to="d6hs:~IssueKindReportItem.TYPESYSTEM" resolve="TYPESYSTEM" />
             </node>
             <node concept="liA8E" id="3Frdzi2HNzf" role="2OqNvi">
-              <ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind():jetbrains.mps.errors.item.IssueKindReportItem$ItemKind" resolve="deriveItemKind" />
+              <ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind()" resolve="deriveItemKind" />
             </node>
           </node>
         </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
index 0f504f96..5c078361 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/jetbrains.mps.coderules.ui.msd
@@ -30,7 +30,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index 5ed81732..e37c0490 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -5,7 +5,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
@@ -965,7 +965,7 @@
                     <ref role="3cqZAo" node="3mz2_dYDl_v" resolve="mpsProject" />
                   </node>
                   <node concept="liA8E" id="52a_GfIDBbe" role="2OqNvi">
-                    <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                    <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                   </node>
                 </node>
                 <node concept="Xjq3P" id="52a_GfIDBv_" role="37wK5m" />
@@ -1038,7 +1038,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="41ox5VnqGcd" role="2OqNvi">
-                <ref role="37wK5l" to="exr9:~EditorComponent.getHighlightManager():jetbrains.mps.nodeEditor.NodeHighlightManager" resolve="getHighlightManager" />
+                <ref role="37wK5l" to="exr9:~EditorComponent.getHighlightManager()" resolve="getHighlightManager" />
               </node>
             </node>
           </node>
@@ -1049,7 +1049,7 @@
             <node concept="2OqwBi" id="5mg4ZgL1WGy" role="2Oq$k0">
               <node concept="2OqwBi" id="5mg4ZgL131j" role="2Oq$k0">
                 <node concept="2YIFZM" id="5mg4ZgL0VEQ" role="2Oq$k0">
-                  <ref role="37wK5l" to="unkn:~Completable.fromAction(io.reactivex.functions.Action):io.reactivex.Completable" resolve="fromAction" />
+                  <ref role="37wK5l" to="unkn:~Completable.fromAction(io.reactivex.functions.Action)" resolve="fromAction" />
                   <ref role="1Pybhc" to="unkn:~Completable" resolve="Completable" />
                   <node concept="1bVj0M" id="5mg4ZgL0XlW" role="37wK5m">
                     <node concept="3clFbS" id="5mg4ZgL0XlY" role="1bW5cS">
@@ -1115,7 +1115,7 @@
                                       <ref role="3cqZAo" node="41ox5VnqGca" resolve="highlightManager" />
                                     </node>
                                     <node concept="liA8E" id="3WU9yfAbQMW" role="2OqNvi">
-                                      <ref role="37wK5l" to="exr9:~NodeHighlightManager.clearForOwner(jetbrains.mps.openapi.editor.message.EditorMessageOwner):boolean" resolve="clearForOwner" />
+                                      <ref role="37wK5l" to="exr9:~NodeHighlightManager.clearForOwner(jetbrains.mps.openapi.editor.message.EditorMessageOwner)" resolve="clearForOwner" />
                                       <node concept="Xjq3P" id="3WU9yfAbQZm" role="37wK5m" />
                                     </node>
                                   </node>
@@ -1203,7 +1203,7 @@
                             <ref role="3cqZAo" node="3mz2_dYDlU7" resolve="mpsProject" />
                           </node>
                           <node concept="liA8E" id="5mg4ZgL9uqV" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -1211,9 +1211,9 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgL15xl" role="2OqNvi">
-                  <ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource):io.reactivex.Single" resolve="andThen" />
+                  <ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource)" resolve="andThen" />
                   <node concept="2YIFZM" id="5lxnBcTZ0ST" role="37wK5m">
-                    <ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable):io.reactivex.Single" resolve="fromCallable" />
+                    <ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable)" resolve="fromCallable" />
                     <ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
                     <node concept="1bVj0M" id="5lxnBcTZ0SU" role="37wK5m">
                       <node concept="3clFbS" id="5lxnBcTZ0SV" role="1bW5cS">
@@ -1272,7 +1272,7 @@
                                           <node concept="3AY5_j" id="78H58oeUMut" role="2OqNvi" />
                                         </node>
                                         <node concept="liA8E" id="5lxnBcTZ0Tn" role="2OqNvi">
-                                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                                           <node concept="2OqwBi" id="5lxnBcTZ0To" role="37wK5m">
                                             <node concept="2JrnkZ" id="5lxnBcTZ0Tp" role="2Oq$k0">
                                               <node concept="37vLTw" id="5lxnBcTZ0Tq" role="2JrQYb">
@@ -1280,7 +1280,7 @@
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="5lxnBcTZ0Tr" role="2OqNvi">
-                                              <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                              <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                                             </node>
                                           </node>
                                         </node>
@@ -1371,11 +1371,11 @@
                                                 <ref role="3cqZAo" node="1FOQehx1Lkm" resolve="nri" />
                                               </node>
                                               <node concept="liA8E" id="1FOQehx24jI" role="2OqNvi">
-                                                <ref role="37wK5l" to="d6hs:~NodeFlavouredItem.getNode():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getNode" />
+                                                <ref role="37wK5l" to="d6hs:~NodeFlavouredItem.getNode()" resolve="getNode" />
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="5lxnBcTZ0TW" role="2OqNvi">
-                                              <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                                              <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                                               <node concept="2OqwBi" id="5lxnBcTZ0TX" role="37wK5m">
                                                 <node concept="2JrnkZ" id="5lxnBcTZ0TY" role="2Oq$k0">
                                                   <node concept="37vLTw" id="5lxnBcTZ0TZ" role="2JrQYb">
@@ -1383,7 +1383,7 @@
                                                   </node>
                                                 </node>
                                                 <node concept="liA8E" id="5lxnBcTZ0U0" role="2OqNvi">
-                                                  <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                                  <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                                                 </node>
                                               </node>
                                             </node>
@@ -1461,7 +1461,7 @@
                               <ref role="3cqZAo" node="3mz2_dYDlU7" resolve="mpsProject" />
                             </node>
                             <node concept="liA8E" id="5lxnBcTZ0Uq" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                             </node>
                           </node>
                         </node>
@@ -1483,15 +1483,15 @@
                 </node>
               </node>
               <node concept="liA8E" id="5mg4ZgL29xn" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="subscribeOn" />
+                <ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler)" resolve="subscribeOn" />
                 <node concept="2YIFZM" id="5mg4ZgL2o2n" role="37wK5m">
-                  <ref role="37wK5l" to="f4yq:~SwingSchedulers.edt():io.reactivex.Scheduler" resolve="edt" />
+                  <ref role="37wK5l" to="f4yq:~SwingSchedulers.edt()" resolve="edt" />
                   <ref role="1Pybhc" to="f4yq:~SwingSchedulers" resolve="SwingSchedulers" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="5lxnBcTWvZ1" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.flatMapCompletable(io.reactivex.functions.Function):io.reactivex.Completable" resolve="flatMapCompletable" />
+              <ref role="37wK5l" to="unkn:~Single.flatMapCompletable(io.reactivex.functions.Function)" resolve="flatMapCompletable" />
               <node concept="1bVj0M" id="5lxnBcTXoeb" role="37wK5m">
                 <node concept="37vLTG" id="5lxnBcTX_is" role="1bW2Oz">
                   <property role="TrG5h" value="messageList" />
@@ -1505,7 +1505,7 @@
                   <node concept="3clFbF" id="5lxnBcTXLp1" role="3cqZAp">
                     <node concept="2OqwBi" id="5lxnBcTYPyG" role="3clFbG">
                       <node concept="2YIFZM" id="5lxnBcTXNCF" role="2Oq$k0">
-                        <ref role="37wK5l" to="unkn:~Completable.fromAction(io.reactivex.functions.Action):io.reactivex.Completable" resolve="fromAction" />
+                        <ref role="37wK5l" to="unkn:~Completable.fromAction(io.reactivex.functions.Action)" resolve="fromAction" />
                         <ref role="1Pybhc" to="unkn:~Completable" resolve="Completable" />
                         <node concept="1bVj0M" id="5lxnBcTXQt_" role="37wK5m">
                           <node concept="3clFbS" id="5lxnBcTXQtA" role="1bW5cS">
@@ -1516,7 +1516,7 @@
                                   <ref role="3cqZAo" node="41ox5VnqGca" resolve="highlightManager" />
                                 </node>
                                 <node concept="liA8E" id="41ox5VnqSv1" role="2OqNvi">
-                                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.mark(java.util.List):void" resolve="mark" />
+                                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.mark(java.util.List)" resolve="mark" />
                                   <node concept="37vLTw" id="3BRW86d0OXZ" role="37wK5m">
                                     <ref role="3cqZAo" node="5lxnBcTX_is" resolve="messageList" />
                                   </node>
@@ -1529,7 +1529,7 @@
                                   <ref role="3cqZAo" node="41ox5VnqGca" resolve="highlightManager" />
                                 </node>
                                 <node concept="liA8E" id="62MNP_kVxtW" role="2OqNvi">
-                                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.repaintAndRebuildEditorMessages():void" resolve="repaintAndRebuildEditorMessages" />
+                                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.repaintAndRebuildEditorMessages()" resolve="repaintAndRebuildEditorMessages" />
                                 </node>
                               </node>
                             </node>
@@ -1538,7 +1538,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="5lxnBcTYSnn" role="2OqNvi">
-                        <ref role="37wK5l" to="unkn:~Completable.subscribeOn(io.reactivex.Scheduler):io.reactivex.Completable" resolve="subscribeOn" />
+                        <ref role="37wK5l" to="unkn:~Completable.subscribeOn(io.reactivex.Scheduler)" resolve="subscribeOn" />
                         <node concept="37vLTw" id="5lxnBcTYVfE" role="37wK5m">
                           <ref role="3cqZAo" node="5lxnBcTUEOg" resolve="subscribeScheduler" />
                         </node>
@@ -1581,7 +1581,7 @@
                 <ref role="3cqZAo" node="3WU9yfAbUm6" resolve="editorComponent" />
               </node>
               <node concept="liA8E" id="62MNP_kVznm" role="2OqNvi">
-                <ref role="37wK5l" to="exr9:~EditorComponent.getHighlightManager():jetbrains.mps.nodeEditor.NodeHighlightManager" resolve="getHighlightManager" />
+                <ref role="37wK5l" to="exr9:~EditorComponent.getHighlightManager()" resolve="getHighlightManager" />
               </node>
             </node>
           </node>
@@ -1639,7 +1639,7 @@
                   <ref role="3cqZAo" node="62MNP_kVznj" resolve="highlightManager" />
                 </node>
                 <node concept="liA8E" id="3WU9yfAbUm4" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.clearForOwner(jetbrains.mps.openapi.editor.message.EditorMessageOwner):boolean" resolve="clearForOwner" />
+                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.clearForOwner(jetbrains.mps.openapi.editor.message.EditorMessageOwner)" resolve="clearForOwner" />
                   <node concept="Xjq3P" id="3WU9yfAbUm5" role="37wK5m" />
                 </node>
               </node>
@@ -1650,7 +1650,7 @@
                   <ref role="3cqZAo" node="62MNP_kVznj" resolve="highlightManager" />
                 </node>
                 <node concept="liA8E" id="62MNP_kVzyR" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.repaintAndRebuildEditorMessages():void" resolve="repaintAndRebuildEditorMessages" />
+                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.repaintAndRebuildEditorMessages()" resolve="repaintAndRebuildEditorMessages" />
                 </node>
               </node>
             </node>
@@ -1742,7 +1742,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="62MNP_kVy6N" role="2OqNvi">
-                    <ref role="37wK5l" to="exr9:~EditorComponent.getHighlightManager():jetbrains.mps.nodeEditor.NodeHighlightManager" resolve="getHighlightManager" />
+                    <ref role="37wK5l" to="exr9:~EditorComponent.getHighlightManager()" resolve="getHighlightManager" />
                   </node>
                 </node>
               </node>
@@ -1753,7 +1753,7 @@
                   <ref role="3cqZAo" node="62MNP_kVy6K" resolve="highlightManager" />
                 </node>
                 <node concept="liA8E" id="41ox5VnrTCV" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.clearForOwner(jetbrains.mps.openapi.editor.message.EditorMessageOwner):boolean" resolve="clearForOwner" />
+                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.clearForOwner(jetbrains.mps.openapi.editor.message.EditorMessageOwner)" resolve="clearForOwner" />
                   <node concept="Xjq3P" id="41ox5VnrTEk" role="37wK5m" />
                 </node>
               </node>
@@ -1764,7 +1764,7 @@
                   <ref role="3cqZAo" node="62MNP_kVy6K" resolve="highlightManager" />
                 </node>
                 <node concept="liA8E" id="62MNP_kVxEN" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.repaintAndRebuildEditorMessages():void" resolve="repaintAndRebuildEditorMessages" />
+                  <ref role="37wK5l" to="exr9:~NodeHighlightManager.repaintAndRebuildEditorMessages()" resolve="repaintAndRebuildEditorMessages" />
                 </node>
               </node>
             </node>
@@ -2147,7 +2147,7 @@
               </node>
             </node>
             <node concept="liA8E" id="4vBwiiVsgHI" role="2OqNvi">
-              <ref role="37wK5l" to="exr9:~EditorComponent.dispose():void" resolve="dispose" />
+              <ref role="37wK5l" to="exr9:~EditorComponent.dispose()" resolve="dispose" />
             </node>
           </node>
         </node>
@@ -2197,7 +2197,7 @@
                   <ref role="3cqZAo" node="4vBwiiVsgKG" resolve="renderComponent" />
                 </node>
                 <node concept="liA8E" id="4vBwiiVsgI7" role="2OqNvi">
-                  <ref role="37wK5l" to="exr9:~EditorComponent.editNode(org.jetbrains.mps.openapi.model.SNode):void" resolve="editNode" />
+                  <ref role="37wK5l" to="exr9:~EditorComponent.editNode(org.jetbrains.mps.openapi.model.SNode)" resolve="editNode" />
                   <node concept="37vLTw" id="4vBwiiVsgI8" role="37wK5m">
                     <ref role="3cqZAo" node="4vBwiiVsgHT" resolve="messageNode" />
                   </node>
@@ -2216,11 +2216,11 @@
                       <ref role="3cqZAo" node="4vBwiiVsgKG" resolve="renderComponent" />
                     </node>
                     <node concept="liA8E" id="4vBwiiVsgIf" role="2OqNvi">
-                      <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell():jetbrains.mps.nodeEditor.cells.EditorCell" resolve="getRootCell" />
+                      <ref role="37wK5l" to="exr9:~EditorComponent.getRootCell()" resolve="getRootCell" />
                     </node>
                   </node>
                   <node concept="liA8E" id="4vBwiiVsgIg" role="2OqNvi">
-                    <ref role="37wK5l" to="f4zo:~EditorCell.renderText():jetbrains.mps.openapi.editor.TextBuilder" resolve="renderText" />
+                    <ref role="37wK5l" to="f4zo:~EditorCell.renderText()" resolve="renderText" />
                   </node>
                 </node>
               </node>
@@ -2241,19 +2241,19 @@
                                 <ref role="3cqZAo" node="4vBwiiVsgIa" resolve="renderText" />
                               </node>
                               <node concept="liA8E" id="4vBwiiVsgIs" role="2OqNvi">
-                                <ref role="37wK5l" to="cj4x:~TextBuilder.getLines():java.lang.Iterable" resolve="getLines" />
+                                <ref role="37wK5l" to="cj4x:~TextBuilder.getLines()" resolve="getLines" />
                               </node>
                             </node>
                             <node concept="liA8E" id="4vBwiiVsgIt" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~Iterable.iterator():java.util.Iterator" resolve="iterator" />
+                              <ref role="37wK5l" to="wyt6:~Iterable.iterator()" resolve="iterator" />
                             </node>
                           </node>
                           <node concept="liA8E" id="4vBwiiVsgIu" role="2OqNvi">
-                            <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                            <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                           </node>
                         </node>
                         <node concept="liA8E" id="4vBwiiVsgIv" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~CharSequence.toString():java.lang.String" resolve="toString" />
+                          <ref role="37wK5l" to="wyt6:~CharSequence.toString()" resolve="toString" />
                         </node>
                       </node>
                     </node>
@@ -2272,7 +2272,7 @@
                     <ref role="3cqZAo" node="4vBwiiVsgIa" resolve="renderText" />
                   </node>
                   <node concept="liA8E" id="4vBwiiVsgI_" role="2OqNvi">
-                    <ref role="37wK5l" to="cj4x:~TextBuilder.getSize():int" resolve="getSize" />
+                    <ref role="37wK5l" to="cj4x:~TextBuilder.getSize()" resolve="getSize" />
                   </node>
                 </node>
               </node>
@@ -2285,7 +2285,7 @@
                           <ref role="3cqZAo" node="4vBwiiVsgIa" resolve="renderText" />
                         </node>
                         <node concept="liA8E" id="4vBwiiVsgIG" role="2OqNvi">
-                          <ref role="37wK5l" to="cj4x:~TextBuilder.getText():java.lang.String" resolve="getText" />
+                          <ref role="37wK5l" to="cj4x:~TextBuilder.getText()" resolve="getText" />
                         </node>
                       </node>
                       <node concept="37vLTw" id="4vBwiiVsgIH" role="37vLTJ">
@@ -2375,7 +2375,7 @@
                         <ref role="3cqZAo" node="4jcOV4hSPAw" resolve="nri" />
                       </node>
                       <node concept="liA8E" id="4jcOV4hSY3I" role="2OqNvi">
-                        <ref role="37wK5l" to="d6hs:~ReportItem.getMessage():java.lang.String" resolve="getMessage" />
+                        <ref role="37wK5l" to="d6hs:~ReportItem.getMessage()" resolve="getMessage" />
                       </node>
                     </node>
                   </node>
@@ -2386,7 +2386,7 @@
                   <ref role="3cqZAo" node="4jcOV4hSPAw" resolve="nri" />
                 </node>
                 <node concept="liA8E" id="4jcOV4hT01Z" role="2OqNvi">
-                  <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity():jetbrains.mps.errors.MessageStatus" resolve="getSeverity" />
+                  <ref role="37wK5l" to="d6hs:~ReportItem.getSeverity()" resolve="getSeverity" />
                 </node>
               </node>
             </node>
@@ -2443,14 +2443,14 @@
                 <ref role="3cqZAo" to="d6hs:~IssueKindReportItem.TYPESYSTEM" resolve="TYPESYSTEM" />
               </node>
               <node concept="liA8E" id="3nc912Krb3j" role="2OqNvi">
-                <ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind(java.lang.String):jetbrains.mps.errors.item.IssueKindReportItem$ItemKind" resolve="deriveItemKind" />
+                <ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind(java.lang.String)" resolve="deriveItemKind" />
                 <node concept="2OqwBi" id="3nc912Krb3k" role="37wK5m">
                   <node concept="Rm8GO" id="3nc912Krb98" role="2Oq$k0">
                     <ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
                     <ref role="1Px2BO" to="2gg1:~MessageStatus" resolve="MessageStatus" />
                   </node>
                   <node concept="liA8E" id="3nc912Krb3m" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Enum.toString():java.lang.String" resolve="toString" />
+                    <ref role="37wK5l" to="wyt6:~Enum.toString()" resolve="toString" />
                   </node>
                 </node>
               </node>
@@ -2497,7 +2497,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="4vBwiiVsgJK" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="4vBwiiVsgJL" role="37wK5m">
@@ -2524,7 +2524,7 @@
         <node concept="3clFbS" id="4vBwiiVsgJR" role="3clF47">
           <node concept="3clFbF" id="4jcOV4hRGik" role="3cqZAp">
             <node concept="2YIFZM" id="4jcOV4hRGu8" role="3clFbG">
-              <ref role="37wK5l" to="exr9:~HighlighterMessage.getMessageColor(jetbrains.mps.errors.MessageStatus):java.awt.Color" resolve="getMessageColor" />
+              <ref role="37wK5l" to="exr9:~HighlighterMessage.getMessageColor(jetbrains.mps.errors.MessageStatus)" resolve="getMessageColor" />
               <ref role="1Pybhc" to="exr9:~HighlighterMessage" resolve="HighlighterMessage" />
               <node concept="Rm8GO" id="4jcOV4hRHcD" role="37wK5m">
                 <ref role="Rm8GQ" to="2gg1:~MessageStatus.OK" resolve="OK" />
@@ -2609,13 +2609,13 @@
                 <ref role="3cqZAo" to="d6hs:~IssueKindReportItem.TYPESYSTEM" resolve="TYPESYSTEM" />
               </node>
               <node concept="liA8E" id="3nc912KraMH" role="2OqNvi">
-                <ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind(java.lang.String):jetbrains.mps.errors.item.IssueKindReportItem$ItemKind" resolve="deriveItemKind" />
+                <ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind(java.lang.String)" resolve="deriveItemKind" />
                 <node concept="2OqwBi" id="3nc912KraMK" role="37wK5m">
                   <node concept="37vLTw" id="4jcOV4hRKSE" role="2Oq$k0">
                     <ref role="3cqZAo" node="4jcOV4hRInx" resolve="status" />
                   </node>
                   <node concept="liA8E" id="3nc912KraMM" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Enum.toString():java.lang.String" resolve="toString" />
+                    <ref role="37wK5l" to="wyt6:~Enum.toString()" resolve="toString" />
                   </node>
                 </node>
               </node>
@@ -2675,7 +2675,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="4vBwiiVsgKu" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                    <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="4vBwiiVsgKv" role="37wK5m">
@@ -2722,7 +2722,7 @@
         <node concept="3clFbS" id="4vBwiiVsgKB" role="3clF47">
           <node concept="3clFbF" id="4jcOV4hS2cW" role="3cqZAp">
             <node concept="2YIFZM" id="4jcOV4hS2oL" role="3clFbG">
-              <ref role="37wK5l" to="exr9:~HighlighterMessage.getMessageColor(jetbrains.mps.errors.MessageStatus):java.awt.Color" resolve="getMessageColor" />
+              <ref role="37wK5l" to="exr9:~HighlighterMessage.getMessageColor(jetbrains.mps.errors.MessageStatus)" resolve="getMessageColor" />
               <ref role="1Pybhc" to="exr9:~HighlighterMessage" resolve="HighlighterMessage" />
               <node concept="37vLTw" id="4jcOV4hS36I" role="37wK5m">
                 <ref role="3cqZAo" node="4jcOV4hRRlZ" resolve="status" />
@@ -2821,7 +2821,7 @@
                 <ref role="3cqZAo" node="4i4XGQZmI3o" resolve="ideaProject" />
               </node>
               <node concept="liA8E" id="4i4XGQZmLGk" role="2OqNvi">
-                <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class):java.lang.Object" resolve="getComponent" />
+                <ref role="37wK5l" to="1m72:~ComponentManager.getComponent(java.lang.Class)" resolve="getComponent" />
                 <node concept="3VsKOn" id="4i4XGQZmLGl" role="37wK5m">
                   <ref role="3VsUkX" to="57ty:~MessagesViewTool" resolve="MessagesViewTool" />
                 </node>
@@ -2888,7 +2888,7 @@
               <ref role="3cqZAo" node="4i4XGQZmM8k" resolve="messagesViewTool" />
             </node>
             <node concept="liA8E" id="61vfVfp4hDh" role="2OqNvi">
-              <ref role="37wK5l" to="57ty:~MessagesViewTool.clear(java.lang.String):void" resolve="clear" />
+              <ref role="37wK5l" to="57ty:~MessagesViewTool.clear(java.lang.String)" resolve="clear" />
               <node concept="37vLTw" id="6IQb_Rx3XX0" role="37wK5m">
                 <ref role="3cqZAo" node="2$F5QpuoU$X" resolve="TAB_NAME" />
               </node>
@@ -3077,14 +3077,14 @@
                 <ref role="3cqZAo" node="4TCblo6bLB6" resolve="sb" />
               </node>
               <node concept="liA8E" id="4TCblo6bS7T" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="Xl_RD" id="4TCblo6bSmN" role="37wK5m">
                   <property role="Xl_RC" value=" " />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="4TCblo6bSHB" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
               <node concept="1LFfDK" id="5mDiJnRYq26" role="37wK5m">
                 <node concept="3cmrfG" id="5mDiJnRYqpM" role="1LF_Uc">
                   <property role="3cmrfH" value="0" />
@@ -3106,21 +3106,21 @@
                       <ref role="3cqZAo" node="4TCblo6bLB6" resolve="sb" />
                     </node>
                     <node concept="liA8E" id="4TCblo6bUG$" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                       <node concept="Xl_RD" id="4TCblo6bUVu" role="37wK5m">
                         <property role="Xl_RC" value=" (" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="4TCblo6bVe9" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="37vLTw" id="4TCblo6bVtn" role="37wK5m">
                       <ref role="3cqZAo" node="4i4XGQZmDsE" resolve="dbg" />
                     </node>
                   </node>
                 </node>
                 <node concept="liA8E" id="4TCblo6bVKY" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="Xl_RD" id="4TCblo6bVZw" role="37wK5m">
                     <property role="Xl_RC" value=")" />
                   </node>
@@ -3137,7 +3137,7 @@
                 <ref role="3cqZAo" node="4i4XGQZmDsE" resolve="dbg" />
               </node>
               <node concept="liA8E" id="24Vro6cSZiO" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
               </node>
             </node>
           </node>
@@ -3148,7 +3148,7 @@
               <ref role="3cqZAo" node="4i4XGQZmMzg" resolve="messagesViewTool" />
             </node>
             <node concept="liA8E" id="4i4XGQZnLlb" role="2OqNvi">
-              <ref role="37wK5l" to="57ty:~MessagesViewTool.add(jetbrains.mps.messages.IMessage,java.lang.String):void" resolve="add" />
+              <ref role="37wK5l" to="57ty:~MessagesViewTool.add(jetbrains.mps.messages.IMessage,java.lang.String)" resolve="add" />
               <node concept="2ShNRf" id="4i4XGQZnLmt" role="37wK5m">
                 <node concept="1pGfFk" id="4i4XGQZnNBp" role="2ShVmc">
                   <ref role="37wK5l" to="et5u:~Message.&lt;init&gt;(jetbrains.mps.messages.MessageKind,java.lang.String)" resolve="Message" />
@@ -3160,7 +3160,7 @@
                       <ref role="3cqZAo" node="4TCblo6bLB6" resolve="sb" />
                     </node>
                     <node concept="liA8E" id="4TCblo6bWJh" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
                     </node>
                   </node>
                 </node>
@@ -3190,7 +3190,7 @@
             <node concept="3clFbS" id="1n2ZgJ3LD4b" role="9aQI4">
               <node concept="3cpWs6" id="1n2ZgJ3LIqx" role="3cqZAp">
                 <node concept="2YIFZM" id="1n2ZgJ3LK5O" role="3cqZAk">
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                   <node concept="37vLTw" id="1n2ZgJ3LL2C" role="37wK5m">
                     <ref role="3cqZAo" node="1n2ZgJ3Lsnv" resolve="o" />
@@ -3211,7 +3211,7 @@
             <node concept="3cpWs6" id="1n2ZgJ3L_Q7" role="3cqZAp">
               <node concept="2YIFZM" id="1n2ZgJ3LMl7" role="3cqZAk">
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <node concept="37vLTw" id="1n2ZgJ3LMl8" role="37wK5m">
                   <ref role="3cqZAo" node="1n2ZgJ3Lsnv" resolve="o" />
                 </node>
@@ -3281,7 +3281,7 @@
                 <ref role="3cqZAo" node="4vBwiiVrV6U" resolve="str" />
               </node>
               <node concept="liA8E" id="4vBwiiVrV7h" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
               </node>
             </node>
           </node>
@@ -3296,7 +3296,7 @@
                     <ref role="3cqZAo" node="4vBwiiVrV6U" resolve="str" />
                   </node>
                   <node concept="liA8E" id="4vBwiiVrV7o" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                    <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                     <node concept="37vLTw" id="4vBwiiVrV7p" role="37wK5m">
                       <ref role="3cqZAo" node="4vBwiiVrV79" resolve="idx" />
                     </node>
@@ -3392,7 +3392,7 @@
                                   <ref role="3cqZAo" node="4vBwiiVrV6U" resolve="str" />
                                 </node>
                                 <node concept="liA8E" id="4vBwiiVrV7X" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                  <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                   <node concept="3cmrfG" id="4vBwiiVrV7Y" role="37wK5m">
                                     <property role="3cmrfH" value="0" />
                                   </node>
@@ -3415,7 +3415,7 @@
                               <ref role="3cqZAo" node="4vBwiiVrV6U" resolve="str" />
                             </node>
                             <node concept="liA8E" id="4vBwiiVrV85" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                              <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                             </node>
                           </node>
                         </node>
@@ -3435,7 +3435,7 @@
                                   <ref role="3cqZAo" node="4vBwiiVrV6U" resolve="str" />
                                 </node>
                                 <node concept="liA8E" id="4vBwiiVrV8e" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                  <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                   <node concept="37vLTw" id="4vBwiiVrV8f" role="37wK5m">
                                     <ref role="3cqZAo" node="4vBwiiVrV79" resolve="idx" />
                                   </node>
@@ -3454,7 +3454,7 @@
                                     <ref role="3cqZAo" node="4vBwiiVrV7K" resolve="sb" />
                                   </node>
                                   <node concept="liA8E" id="4vBwiiVrV8m" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(char):java.lang.StringBuilder" resolve="append" />
+                                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(char)" resolve="append" />
                                     <node concept="37vLTw" id="4vBwiiVrV8n" role="37wK5m">
                                       <ref role="3cqZAo" node="4vBwiiVrV7k" resolve="c" />
                                     </node>
@@ -3473,7 +3473,7 @@
                                       <ref role="3cqZAo" node="4vBwiiVrV7K" resolve="sb" />
                                     </node>
                                     <node concept="liA8E" id="4vBwiiVrV8u" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                                       <node concept="Xl_RD" id="4vBwiiVrV8v" role="37wK5m">
                                         <property role="Xl_RC" value="&amp;amp;" />
                                       </node>
@@ -3494,7 +3494,7 @@
                                       <ref role="3cqZAo" node="4vBwiiVrV7K" resolve="sb" />
                                     </node>
                                     <node concept="liA8E" id="4vBwiiVrV8B" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                                       <node concept="Xl_RD" id="4vBwiiVrV8C" role="37wK5m">
                                         <property role="Xl_RC" value="&amp;lt;" />
                                       </node>
@@ -3515,7 +3515,7 @@
                                       <ref role="3cqZAo" node="4vBwiiVrV7K" resolve="sb" />
                                     </node>
                                     <node concept="liA8E" id="4vBwiiVrV8K" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                                       <node concept="Xl_RD" id="4vBwiiVrV8L" role="37wK5m">
                                         <property role="Xl_RC" value="&amp;gt;" />
                                       </node>
@@ -3536,7 +3536,7 @@
                                       <ref role="3cqZAo" node="4vBwiiVrV7K" resolve="sb" />
                                     </node>
                                     <node concept="liA8E" id="4vBwiiVrXTK" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                                       <node concept="Xl_RD" id="4vBwiiVrY3p" role="37wK5m">
                                         <property role="Xl_RC" value="&lt;br/&gt;" />
                                       </node>
@@ -3557,7 +3557,7 @@
                         <ref role="3cqZAo" node="4vBwiiVrV7K" resolve="sb" />
                       </node>
                       <node concept="liA8E" id="4vBwiiVrV8Q" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+                        <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
                       </node>
                     </node>
                   </node>
@@ -3742,7 +3742,7 @@
           <node concept="3clFbF" id="6QkkSolcsFV" role="3cqZAp">
             <node concept="10QFUN" id="6QkkSolcsFW" role="3clFbG">
               <node concept="3nyPlj" id="6QkkSolcsFX" role="10QFUP">
-                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.getUserObject():java.lang.Object" resolve="getUserObject" />
+                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.getUserObject()" resolve="getUserObject" />
               </node>
               <node concept="16syzq" id="6QkkSolcsFY" role="10QFUM">
                 <ref role="16sUi3" node="6QkkSolcsG2" resolve="UserData" />
@@ -4025,7 +4025,7 @@
           <node concept="3clFbS" id="1EFtv_BAcRM" role="3clFbx">
             <node concept="3clFbF" id="1EFtv_BAmGf" role="3cqZAp">
               <node concept="1rXfSq" id="1EFtv_BAmGe" role="3clFbG">
-                <ref role="37wK5l" to="z60i:~Component.removeMouseListener(java.awt.event.MouseListener):void" resolve="removeMouseListener" />
+                <ref role="37wK5l" to="z60i:~Component.removeMouseListener(java.awt.event.MouseListener)" resolve="removeMouseListener" />
                 <node concept="37vLTw" id="1EFtv_BApe2" role="37wK5m">
                   <ref role="3cqZAo" node="1EFtv_BA2yc" resolve="mouseListener" />
                 </node>
@@ -4048,7 +4048,7 @@
           <node concept="3clFbS" id="1EFtv_BABju" role="3clFbx">
             <node concept="3clFbF" id="1EFtv_BAJPp" role="3cqZAp">
               <node concept="1rXfSq" id="1EFtv_BAJPn" role="3clFbG">
-                <ref role="37wK5l" to="z60i:~Component.removeMouseMotionListener(java.awt.event.MouseMotionListener):void" resolve="removeMouseMotionListener" />
+                <ref role="37wK5l" to="z60i:~Component.removeMouseMotionListener(java.awt.event.MouseMotionListener)" resolve="removeMouseMotionListener" />
                 <node concept="37vLTw" id="1EFtv_BAMpt" role="37wK5m">
                   <ref role="3cqZAo" node="1EFtv_BA48H" resolve="mouseMotionListener" />
                 </node>
@@ -4089,7 +4089,7 @@
         <node concept="3clFbF" id="6QkkSol7XsR" role="3cqZAp">
           <node concept="10QFUN" id="6QkkSol80Q2" role="3clFbG">
             <node concept="3nyPlj" id="6QkkSol80Q1" role="10QFUP">
-              <ref role="37wK5l" to="u30n:~TreeTable.getTableModel():com.intellij.ui.treeStructure.treetable.TreeTableModel" resolve="getTableModel" />
+              <ref role="37wK5l" to="u30n:~TreeTable.getTableModel()" resolve="getTableModel" />
             </node>
             <node concept="3uibUv" id="6QkkSol81RX" role="10QFUM">
               <ref role="3uigEE" node="3ZNrYIhIMAH" resolve="IndexedTreeTableModel" />
@@ -4198,11 +4198,11 @@
                   <ref role="3cqZAo" to="lzb2:~ExpandableItemsHandler.EXPANDED_RENDERER" resolve="EXPANDED_RENDERER" />
                 </node>
                 <node concept="liA8E" id="2WvBUTaB2NL" role="2OqNvi">
-                  <ref role="37wK5l" to="zn9m:~Key.toString():java.lang.String" resolve="toString" />
+                  <ref role="37wK5l" to="zn9m:~Key.toString()" resolve="toString" />
                 </node>
               </node>
               <node concept="liA8E" id="2WvBUTaB36B" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                 <node concept="37vLTw" id="2WvBUTaB4aP" role="37wK5m">
                   <ref role="3cqZAo" node="2WvBUTaA6CN" resolve="name" />
                 </node>
@@ -4215,11 +4215,11 @@
                   <ref role="3cqZAo" to="lzb2:~ExpandableItemsHandler.USE_RENDERER_BOUNDS" resolve="USE_RENDERER_BOUNDS" />
                 </node>
                 <node concept="liA8E" id="2WvBUTaB6r8" role="2OqNvi">
-                  <ref role="37wK5l" to="zn9m:~Key.toString():java.lang.String" resolve="toString" />
+                  <ref role="37wK5l" to="zn9m:~Key.toString()" resolve="toString" />
                 </node>
               </node>
               <node concept="liA8E" id="2WvBUTaB6r9" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                 <node concept="37vLTw" id="2WvBUTaB6ra" role="37wK5m">
                   <ref role="3cqZAo" node="2WvBUTaA6CN" resolve="name" />
                 </node>
@@ -4230,7 +4230,7 @@
         <node concept="3clFbH" id="2WvBUTaAX5I" role="3cqZAp" />
         <node concept="3clFbF" id="2WvBUTaA6Dc" role="3cqZAp">
           <node concept="3nyPlj" id="2WvBUTaA6Db" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Component.firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object):void" resolve="firePropertyChange" />
+            <ref role="37wK5l" to="z60i:~Component.firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)" resolve="firePropertyChange" />
             <node concept="37vLTw" id="2WvBUTaA6D8" role="37wK5m">
               <ref role="3cqZAo" node="2WvBUTaA6CN" resolve="name" />
             </node>
@@ -4349,7 +4349,7 @@
                           </node>
                           <node concept="2YIFZM" id="1EFtv_BA4cB" role="33vP2m">
                             <ref role="1Pybhc" to="z60i:~Cursor" resolve="Cursor" />
-                            <ref role="37wK5l" to="z60i:~Cursor.getDefaultCursor():java.awt.Cursor" resolve="getDefaultCursor" />
+                            <ref role="37wK5l" to="z60i:~Cursor.getDefaultCursor()" resolve="getDefaultCursor" />
                           </node>
                         </node>
                       </node>
@@ -4365,7 +4365,7 @@
                               <ref role="3cqZAo" node="1EFtv_BA4cx" resolve="event" />
                             </node>
                             <node concept="liA8E" id="1EFtv_BA4cI" role="2OqNvi">
-                              <ref role="37wK5l" to="hyam:~MouseEvent.getPoint():java.awt.Point" resolve="getPoint" />
+                              <ref role="37wK5l" to="hyam:~MouseEvent.getPoint()" resolve="getPoint" />
                             </node>
                           </node>
                         </node>
@@ -4375,7 +4375,7 @@
                           <property role="TrG5h" value="row" />
                           <node concept="10Oyi0" id="1EFtv_BA4cL" role="1tU5fm" />
                           <node concept="1rXfSq" id="1EFtv_BA4cM" role="33vP2m">
-                            <ref role="37wK5l" to="dxuu:~JTable.rowAtPoint(java.awt.Point):int" resolve="rowAtPoint" />
+                            <ref role="37wK5l" to="dxuu:~JTable.rowAtPoint(java.awt.Point)" resolve="rowAtPoint" />
                             <node concept="37vLTw" id="1EFtv_BA4cN" role="37wK5m">
                               <ref role="3cqZAo" node="1EFtv_BA4cE" resolve="p" />
                             </node>
@@ -4387,7 +4387,7 @@
                           <property role="TrG5h" value="column" />
                           <node concept="10Oyi0" id="1EFtv_BA4cQ" role="1tU5fm" />
                           <node concept="1rXfSq" id="1EFtv_BA4cR" role="33vP2m">
-                            <ref role="37wK5l" to="dxuu:~JTable.columnAtPoint(java.awt.Point):int" resolve="columnAtPoint" />
+                            <ref role="37wK5l" to="dxuu:~JTable.columnAtPoint(java.awt.Point)" resolve="columnAtPoint" />
                             <node concept="37vLTw" id="1EFtv_BA4cS" role="37wK5m">
                               <ref role="3cqZAo" node="1EFtv_BA4cE" resolve="p" />
                             </node>
@@ -4431,7 +4431,7 @@
                             <ref role="3uigEE" to="c8ee:~TableCellRenderer" resolve="TableCellRenderer" />
                           </node>
                           <node concept="1rXfSq" id="1EFtv_BA4da" role="33vP2m">
-                            <ref role="37wK5l" to="dxuu:~JTable.getCellRenderer(int,int):javax.swing.table.TableCellRenderer" resolve="getCellRenderer" />
+                            <ref role="37wK5l" to="dxuu:~JTable.getCellRenderer(int,int)" resolve="getCellRenderer" />
                             <node concept="37vLTw" id="1EFtv_BA4db" role="37wK5m">
                               <ref role="3cqZAo" node="1EFtv_BA4cK" resolve="row" />
                             </node>
@@ -4486,10 +4486,10 @@
                               <node concept="10Oyi0" id="1EFtv_BA4dx" role="1tU5fm" />
                               <node concept="2OqwBi" id="1EFtv_BA4dy" role="33vP2m">
                                 <node concept="1rXfSq" id="1EFtv_BA4dz" role="2Oq$k0">
-                                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel():javax.swing.table.TableColumnModel" resolve="getColumnModel" />
+                                  <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
                                 </node>
                                 <node concept="liA8E" id="1EFtv_BA4d$" role="2OqNvi">
-                                  <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumnCount():int" resolve="getColumnCount" />
+                                  <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumnCount()" resolve="getColumnCount" />
                                 </node>
                               </node>
                             </node>
@@ -4503,7 +4503,7 @@
                                     <ref role="3uigEE" to="c8ee:~TableCellRenderer" resolve="TableCellRenderer" />
                                   </node>
                                   <node concept="1rXfSq" id="1EFtv_BA4dE" role="33vP2m">
-                                    <ref role="37wK5l" to="dxuu:~JTable.getCellRenderer(int,int):javax.swing.table.TableCellRenderer" resolve="getCellRenderer" />
+                                    <ref role="37wK5l" to="dxuu:~JTable.getCellRenderer(int,int)" resolve="getCellRenderer" />
                                     <node concept="3cmrfG" id="1EFtv_BA4dF" role="37wK5m">
                                       <property role="3cmrfH" value="0" />
                                     </node>
@@ -4602,7 +4602,7 @@
                                 <ref role="3uigEE" to="z60i:~Component" resolve="Component" />
                               </node>
                               <node concept="1rXfSq" id="1EFtv_BA4eg" role="33vP2m">
-                                <ref role="37wK5l" to="3pb2:~JBTable.prepareRenderer(javax.swing.table.TableCellRenderer,int,int):java.awt.Component" resolve="prepareRenderer" />
+                                <ref role="37wK5l" to="3pb2:~JBTable.prepareRenderer(javax.swing.table.TableCellRenderer,int,int)" resolve="prepareRenderer" />
                                 <node concept="37vLTw" id="1EFtv_BA4eh" role="37wK5m">
                                   <ref role="3cqZAo" node="1EFtv_BA4d8" resolve="cellRenderer" />
                                 </node>
@@ -4623,7 +4623,7 @@
                                 <ref role="3uigEE" to="z60i:~Rectangle" resolve="Rectangle" />
                               </node>
                               <node concept="1rXfSq" id="1EFtv_BA4eo" role="33vP2m">
-                                <ref role="37wK5l" to="dxuu:~JTable.getCellRect(int,int,boolean):java.awt.Rectangle" resolve="getCellRect" />
+                                <ref role="37wK5l" to="dxuu:~JTable.getCellRect(int,int,boolean)" resolve="getCellRect" />
                                 <node concept="37vLTw" id="1EFtv_BA4ep" role="37wK5m">
                                   <ref role="3cqZAo" node="1EFtv_BA4cK" resolve="row" />
                                 </node>
@@ -4642,7 +4642,7 @@
                                 <ref role="3cqZAo" node="1EFtv_BA4cE" resolve="p" />
                               </node>
                               <node concept="liA8E" id="1EFtv_BA4ev" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~Point.translate(int,int):void" resolve="translate" />
+                                <ref role="37wK5l" to="z60i:~Point.translate(int,int)" resolve="translate" />
                                 <node concept="1ZRNhn" id="1EFtv_BA4ew" role="37wK5m">
                                   <node concept="10QFUN" id="1EFtv_BA4ex" role="2$L3a6">
                                     <node concept="2OqwBi" id="1EFtv_BA4ey" role="10QFUP">
@@ -4650,7 +4650,7 @@
                                         <ref role="3cqZAo" node="1EFtv_BA4em" resolve="cellRect" />
                                       </node>
                                       <node concept="liA8E" id="1EFtv_BA4e$" role="2OqNvi">
-                                        <ref role="37wK5l" to="z60i:~Rectangle.getX():double" resolve="getX" />
+                                        <ref role="37wK5l" to="z60i:~Rectangle.getX()" resolve="getX" />
                                       </node>
                                     </node>
                                     <node concept="10Oyi0" id="1EFtv_BA4e_" role="10QFUM" />
@@ -4663,14 +4663,14 @@
                                         <ref role="3cqZAo" node="1EFtv_BA4em" resolve="cellRect" />
                                       </node>
                                       <node concept="liA8E" id="1EFtv_BA4eE" role="2OqNvi">
-                                        <ref role="37wK5l" to="z60i:~Rectangle.getY():double" resolve="getY" />
+                                        <ref role="37wK5l" to="z60i:~Rectangle.getY()" resolve="getY" />
                                       </node>
                                     </node>
                                     <node concept="10Oyi0" id="1EFtv_BA4eF" role="10QFUM" />
                                   </node>
                                   <node concept="1ZRNhn" id="1EFtv_BA4eG" role="3uHU7B">
                                     <node concept="1rXfSq" id="1EFtv_BA4eH" role="2$L3a6">
-                                      <ref role="37wK5l" to="dxuu:~JComponent.getY():int" resolve="getY" />
+                                      <ref role="37wK5l" to="dxuu:~JComponent.getY()" resolve="getY" />
                                     </node>
                                   </node>
                                 </node>
@@ -4687,10 +4687,10 @@
                                   </node>
                                   <node concept="2OqwBi" id="1EFtv_BA4eN" role="33vP2m">
                                     <node concept="1rXfSq" id="1EFtv_BA4eO" role="2Oq$k0">
-                                      <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                                      <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
                                     </node>
                                     <node concept="liA8E" id="1EFtv_BA4eP" role="2OqNvi">
-                                      <ref role="37wK5l" to="dxuu:~JTree.getRowBounds(int):java.awt.Rectangle" resolve="getRowBounds" />
+                                      <ref role="37wK5l" to="dxuu:~JTree.getRowBounds(int)" resolve="getRowBounds" />
                                       <node concept="37vLTw" id="1EFtv_BA4eQ" role="37wK5m">
                                         <ref role="3cqZAo" node="1EFtv_BA4cK" resolve="row" />
                                       </node>
@@ -4704,7 +4704,7 @@
                                     <ref role="3cqZAo" node="1EFtv_BA4cE" resolve="p" />
                                   </node>
                                   <node concept="liA8E" id="1EFtv_BA4eU" role="2OqNvi">
-                                    <ref role="37wK5l" to="z60i:~Point.translate(int,int):void" resolve="translate" />
+                                    <ref role="37wK5l" to="z60i:~Point.translate(int,int)" resolve="translate" />
                                     <node concept="1ZRNhn" id="1EFtv_BA4eV" role="37wK5m">
                                       <node concept="10QFUN" id="1EFtv_BA4eW" role="2$L3a6">
                                         <node concept="10Oyi0" id="1EFtv_BA4eX" role="10QFUM" />
@@ -4715,7 +4715,7 @@
                                                 <ref role="3cqZAo" node="1EFtv_BA4eL" resolve="treeCellRect" />
                                               </node>
                                               <node concept="liA8E" id="1EFtv_BA4f2" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~Rectangle.getX():double" resolve="getX" />
+                                                <ref role="37wK5l" to="z60i:~Rectangle.getX()" resolve="getX" />
                                               </node>
                                             </node>
                                             <node concept="2OqwBi" id="1EFtv_BA4f3" role="3uHU7w">
@@ -4723,7 +4723,7 @@
                                                 <ref role="3cqZAo" node="1EFtv_BA4em" resolve="cellRect" />
                                               </node>
                                               <node concept="liA8E" id="1EFtv_BA4f5" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~Rectangle.getX():double" resolve="getX" />
+                                                <ref role="37wK5l" to="z60i:~Rectangle.getX()" resolve="getX" />
                                               </node>
                                             </node>
                                           </node>
@@ -4742,9 +4742,9 @@
                                 <ref role="3VsUkX" to="u30n:~TreeTableModel" resolve="TreeTableModel" />
                               </node>
                               <node concept="liA8E" id="1EFtv_BA4f9" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
+                                <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class)" resolve="isAssignableFrom" />
                                 <node concept="1rXfSq" id="1EFtv_BA4fa" role="37wK5m">
-                                  <ref role="37wK5l" to="dxuu:~JTable.getColumnClass(int):java.lang.Class" resolve="getColumnClass" />
+                                  <ref role="37wK5l" to="dxuu:~JTable.getColumnClass(int)" resolve="getColumnClass" />
                                   <node concept="37vLTw" id="1EFtv_BA4fb" role="37wK5m">
                                     <ref role="3cqZAo" node="1EFtv_BA4cP" resolve="column" />
                                   </node>
@@ -4762,7 +4762,7 @@
                                   </node>
                                   <node concept="2YIFZM" id="1EFtv_BA4fi" role="37vLTx">
                                     <ref role="1Pybhc" to="z60i:~Cursor" resolve="Cursor" />
-                                    <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int):java.awt.Cursor" resolve="getPredefinedCursor" />
+                                    <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int)" resolve="getPredefinedCursor" />
                                     <node concept="10M0yZ" id="1EFtv_BA4fj" role="37wK5m">
                                       <ref role="1PxDUh" to="z60i:~Cursor" resolve="Cursor" />
                                       <ref role="3cqZAo" to="z60i:~Cursor.HAND_CURSOR" resolve="HAND_CURSOR" />
@@ -4806,7 +4806,7 @@
                                 <node concept="3clFbF" id="1EFtv_BA4fy" role="3cqZAp">
                                   <node concept="37vLTI" id="1EFtv_BA4fz" role="3clFbG">
                                     <node concept="2YIFZM" id="1EFtv_BA4f$" role="37vLTx">
-                                      <ref role="37wK5l" to="z60i:~Cursor.getDefaultCursor():java.awt.Cursor" resolve="getDefaultCursor" />
+                                      <ref role="37wK5l" to="z60i:~Cursor.getDefaultCursor()" resolve="getDefaultCursor" />
                                       <ref role="1Pybhc" to="z60i:~Cursor" resolve="Cursor" />
                                     </node>
                                     <node concept="37vLTw" id="1EFtv_BA4f_" role="37vLTJ">
@@ -4820,7 +4820,7 @@
                           <node concept="3clFbH" id="1EFtv_BA4fA" role="3cqZAp" />
                           <node concept="3clFbF" id="1EFtv_BA4fB" role="3cqZAp">
                             <node concept="1rXfSq" id="1EFtv_BA4fC" role="3clFbG">
-                              <ref role="37wK5l" to="dxuu:~JComponent.repaint(java.awt.Rectangle):void" resolve="repaint" />
+                              <ref role="37wK5l" to="dxuu:~JComponent.repaint(java.awt.Rectangle)" resolve="repaint" />
                               <node concept="37vLTw" id="1EFtv_BA4fD" role="37wK5m">
                                 <ref role="3cqZAo" node="1EFtv_BA4em" resolve="cellRect" />
                               </node>
@@ -4830,9 +4830,9 @@
                             <node concept="3clFbS" id="1EFtv_BA4fF" role="3clFbx">
                               <node concept="3clFbF" id="1EFtv_BA4fG" role="3cqZAp">
                                 <node concept="1rXfSq" id="1EFtv_BA4fH" role="3clFbG">
-                                  <ref role="37wK5l" to="dxuu:~JComponent.repaint(java.awt.Rectangle):void" resolve="repaint" />
+                                  <ref role="37wK5l" to="dxuu:~JComponent.repaint(java.awt.Rectangle)" resolve="repaint" />
                                   <node concept="1rXfSq" id="1EFtv_BA4fI" role="37wK5m">
-                                    <ref role="37wK5l" to="dxuu:~JTable.getCellRect(int,int,boolean):java.awt.Rectangle" resolve="getCellRect" />
+                                    <ref role="37wK5l" to="dxuu:~JTable.getCellRect(int,int,boolean)" resolve="getCellRect" />
                                     <node concept="37vLTw" id="1EFtv_BA4fJ" role="37wK5m">
                                       <ref role="3cqZAo" node="1EFtv_BA4dn" resolve="prevRow" />
                                     </node>
@@ -4868,7 +4868,7 @@
                       <node concept="3clFbH" id="1EFtv_BA4fS" role="3cqZAp" />
                       <node concept="3clFbF" id="1EFtv_BA4fT" role="3cqZAp">
                         <node concept="1rXfSq" id="1EFtv_BA4fU" role="3clFbG">
-                          <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor):void" resolve="setCursor" />
+                          <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor)" resolve="setCursor" />
                           <node concept="37vLTw" id="1EFtv_BA4fV" role="37wK5m">
                             <ref role="3cqZAo" node="1EFtv_BA4c_" resolve="cursor" />
                           </node>
@@ -4887,7 +4887,7 @@
         </node>
         <node concept="3clFbF" id="5pDu2jaJRg7" role="3cqZAp">
           <node concept="1rXfSq" id="5pDu2jaJRg5" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Component.addMouseMotionListener(java.awt.event.MouseMotionListener):void" resolve="addMouseMotionListener" />
+            <ref role="37wK5l" to="z60i:~Component.addMouseMotionListener(java.awt.event.MouseMotionListener)" resolve="addMouseMotionListener" />
             <node concept="2OqwBi" id="1EFtv_BA5JI" role="37wK5m">
               <node concept="Xjq3P" id="1EFtv_BA5JJ" role="2Oq$k0" />
               <node concept="2OwXpG" id="1EFtv_BA5JK" role="2OqNvi">
@@ -4932,9 +4932,9 @@
                             <ref role="1HBi2w" node="5pDu2jaI1pA" resolve="ActionableTreeTable" />
                           </node>
                           <node concept="liA8E" id="1EFtv_BA2_s" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor):void" resolve="setCursor" />
+                            <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor)" resolve="setCursor" />
                             <node concept="2YIFZM" id="1EFtv_BA2_t" role="37wK5m">
-                              <ref role="37wK5l" to="z60i:~Cursor.getDefaultCursor():java.awt.Cursor" resolve="getDefaultCursor" />
+                              <ref role="37wK5l" to="z60i:~Cursor.getDefaultCursor()" resolve="getDefaultCursor" />
                               <ref role="1Pybhc" to="z60i:~Cursor" resolve="Cursor" />
                             </node>
                           </node>
@@ -4971,7 +4971,7 @@
                               <ref role="3cqZAo" node="1EFtv_BA2_z" resolve="event" />
                             </node>
                             <node concept="liA8E" id="1EFtv_BA2_F" role="2OqNvi">
-                              <ref role="37wK5l" to="hyam:~MouseEvent.getPoint():java.awt.Point" resolve="getPoint" />
+                              <ref role="37wK5l" to="hyam:~MouseEvent.getPoint()" resolve="getPoint" />
                             </node>
                           </node>
                         </node>
@@ -4981,7 +4981,7 @@
                           <property role="TrG5h" value="row" />
                           <node concept="10Oyi0" id="1EFtv_BA2_I" role="1tU5fm" />
                           <node concept="1rXfSq" id="1EFtv_BA2_J" role="33vP2m">
-                            <ref role="37wK5l" to="dxuu:~JTable.rowAtPoint(java.awt.Point):int" resolve="rowAtPoint" />
+                            <ref role="37wK5l" to="dxuu:~JTable.rowAtPoint(java.awt.Point)" resolve="rowAtPoint" />
                             <node concept="37vLTw" id="1EFtv_BA2_K" role="37wK5m">
                               <ref role="3cqZAo" node="1EFtv_BA2_B" resolve="p" />
                             </node>
@@ -4993,7 +4993,7 @@
                           <property role="TrG5h" value="column" />
                           <node concept="10Oyi0" id="1EFtv_BA2_N" role="1tU5fm" />
                           <node concept="1rXfSq" id="1EFtv_BA2_O" role="33vP2m">
-                            <ref role="37wK5l" to="dxuu:~JTable.columnAtPoint(java.awt.Point):int" resolve="columnAtPoint" />
+                            <ref role="37wK5l" to="dxuu:~JTable.columnAtPoint(java.awt.Point)" resolve="columnAtPoint" />
                             <node concept="37vLTw" id="1EFtv_BA2_P" role="37wK5m">
                               <ref role="3cqZAo" node="1EFtv_BA2_B" resolve="p" />
                             </node>
@@ -5037,7 +5037,7 @@
                             <ref role="3uigEE" to="c8ee:~TableCellRenderer" resolve="TableCellRenderer" />
                           </node>
                           <node concept="1rXfSq" id="1EFtv_BA2A7" role="33vP2m">
-                            <ref role="37wK5l" to="dxuu:~JTable.getCellRenderer(int,int):javax.swing.table.TableCellRenderer" resolve="getCellRenderer" />
+                            <ref role="37wK5l" to="dxuu:~JTable.getCellRenderer(int,int)" resolve="getCellRenderer" />
                             <node concept="37vLTw" id="1EFtv_BA2A8" role="37wK5m">
                               <ref role="3cqZAo" node="1EFtv_BA2_H" resolve="row" />
                             </node>
@@ -5088,7 +5088,7 @@
                                 <ref role="3uigEE" to="z60i:~Component" resolve="Component" />
                               </node>
                               <node concept="1rXfSq" id="1EFtv_BA2As" role="33vP2m">
-                                <ref role="37wK5l" to="3pb2:~JBTable.prepareRenderer(javax.swing.table.TableCellRenderer,int,int):java.awt.Component" resolve="prepareRenderer" />
+                                <ref role="37wK5l" to="3pb2:~JBTable.prepareRenderer(javax.swing.table.TableCellRenderer,int,int)" resolve="prepareRenderer" />
                                 <node concept="37vLTw" id="1EFtv_BA2At" role="37wK5m">
                                   <ref role="3cqZAo" node="1EFtv_BA2A5" resolve="cellRenderer" />
                                 </node>
@@ -5109,7 +5109,7 @@
                                 <ref role="3uigEE" to="z60i:~Rectangle" resolve="Rectangle" />
                               </node>
                               <node concept="1rXfSq" id="1EFtv_BA2A$" role="33vP2m">
-                                <ref role="37wK5l" to="dxuu:~JTable.getCellRect(int,int,boolean):java.awt.Rectangle" resolve="getCellRect" />
+                                <ref role="37wK5l" to="dxuu:~JTable.getCellRect(int,int,boolean)" resolve="getCellRect" />
                                 <node concept="37vLTw" id="1EFtv_BA2A_" role="37wK5m">
                                   <ref role="3cqZAo" node="1EFtv_BA2_H" resolve="row" />
                                 </node>
@@ -5128,7 +5128,7 @@
                                 <ref role="3cqZAo" node="1EFtv_BA2_B" resolve="p" />
                               </node>
                               <node concept="liA8E" id="1EFtv_BA2AF" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~Point.translate(int,int):void" resolve="translate" />
+                                <ref role="37wK5l" to="z60i:~Point.translate(int,int)" resolve="translate" />
                                 <node concept="1ZRNhn" id="1EFtv_BA2AG" role="37wK5m">
                                   <node concept="10QFUN" id="1EFtv_BA2AH" role="2$L3a6">
                                     <node concept="2OqwBi" id="1EFtv_BA2AI" role="10QFUP">
@@ -5136,7 +5136,7 @@
                                         <ref role="3cqZAo" node="1EFtv_BA2Ay" resolve="cellRect" />
                                       </node>
                                       <node concept="liA8E" id="1EFtv_BA2AK" role="2OqNvi">
-                                        <ref role="37wK5l" to="z60i:~Rectangle.getX():double" resolve="getX" />
+                                        <ref role="37wK5l" to="z60i:~Rectangle.getX()" resolve="getX" />
                                       </node>
                                     </node>
                                     <node concept="10Oyi0" id="1EFtv_BA2AL" role="10QFUM" />
@@ -5149,14 +5149,14 @@
                                         <ref role="3cqZAo" node="1EFtv_BA2Ay" resolve="cellRect" />
                                       </node>
                                       <node concept="liA8E" id="1EFtv_BA2AQ" role="2OqNvi">
-                                        <ref role="37wK5l" to="z60i:~Rectangle.getY():double" resolve="getY" />
+                                        <ref role="37wK5l" to="z60i:~Rectangle.getY()" resolve="getY" />
                                       </node>
                                     </node>
                                     <node concept="10Oyi0" id="1EFtv_BA2AR" role="10QFUM" />
                                   </node>
                                   <node concept="1ZRNhn" id="1EFtv_BA2AS" role="3uHU7B">
                                     <node concept="1rXfSq" id="1EFtv_BA2AT" role="2$L3a6">
-                                      <ref role="37wK5l" to="dxuu:~JComponent.getY():int" resolve="getY" />
+                                      <ref role="37wK5l" to="dxuu:~JComponent.getY()" resolve="getY" />
                                     </node>
                                   </node>
                                 </node>
@@ -5173,10 +5173,10 @@
                                   </node>
                                   <node concept="2OqwBi" id="1EFtv_BA2AZ" role="33vP2m">
                                     <node concept="1rXfSq" id="1EFtv_BA2B0" role="2Oq$k0">
-                                      <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                                      <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
                                     </node>
                                     <node concept="liA8E" id="1EFtv_BA2B1" role="2OqNvi">
-                                      <ref role="37wK5l" to="dxuu:~JTree.getRowBounds(int):java.awt.Rectangle" resolve="getRowBounds" />
+                                      <ref role="37wK5l" to="dxuu:~JTree.getRowBounds(int)" resolve="getRowBounds" />
                                       <node concept="37vLTw" id="1EFtv_BA2B2" role="37wK5m">
                                         <ref role="3cqZAo" node="1EFtv_BA2_H" resolve="row" />
                                       </node>
@@ -5190,7 +5190,7 @@
                                     <ref role="3cqZAo" node="1EFtv_BA2_B" resolve="p" />
                                   </node>
                                   <node concept="liA8E" id="1EFtv_BA2B6" role="2OqNvi">
-                                    <ref role="37wK5l" to="z60i:~Point.translate(int,int):void" resolve="translate" />
+                                    <ref role="37wK5l" to="z60i:~Point.translate(int,int)" resolve="translate" />
                                     <node concept="1ZRNhn" id="1EFtv_BA2B7" role="37wK5m">
                                       <node concept="10QFUN" id="1EFtv_BA2B8" role="2$L3a6">
                                         <node concept="10Oyi0" id="1EFtv_BA2B9" role="10QFUM" />
@@ -5201,7 +5201,7 @@
                                                 <ref role="3cqZAo" node="1EFtv_BA2AX" resolve="treeCellRect" />
                                               </node>
                                               <node concept="liA8E" id="1EFtv_BA2Be" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~Rectangle.getX():double" resolve="getX" />
+                                                <ref role="37wK5l" to="z60i:~Rectangle.getX()" resolve="getX" />
                                               </node>
                                             </node>
                                             <node concept="2OqwBi" id="1EFtv_BA2Bf" role="3uHU7w">
@@ -5209,7 +5209,7 @@
                                                 <ref role="3cqZAo" node="1EFtv_BA2Ay" resolve="cellRect" />
                                               </node>
                                               <node concept="liA8E" id="1EFtv_BA2Bh" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~Rectangle.getX():double" resolve="getX" />
+                                                <ref role="37wK5l" to="z60i:~Rectangle.getX()" resolve="getX" />
                                               </node>
                                             </node>
                                           </node>
@@ -5228,9 +5228,9 @@
                                 <ref role="3VsUkX" to="u30n:~TreeTableModel" resolve="TreeTableModel" />
                               </node>
                               <node concept="liA8E" id="1EFtv_BA2Bl" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class):boolean" resolve="isAssignableFrom" />
+                                <ref role="37wK5l" to="wyt6:~Class.isAssignableFrom(java.lang.Class)" resolve="isAssignableFrom" />
                                 <node concept="1rXfSq" id="1EFtv_BA2Bm" role="37wK5m">
-                                  <ref role="37wK5l" to="dxuu:~JTable.getColumnClass(int):java.lang.Class" resolve="getColumnClass" />
+                                  <ref role="37wK5l" to="dxuu:~JTable.getColumnClass(int)" resolve="getColumnClass" />
                                   <node concept="37vLTw" id="1EFtv_BA2Bn" role="37wK5m">
                                     <ref role="3cqZAo" node="1EFtv_BA2_M" resolve="column" />
                                   </node>
@@ -5256,7 +5256,7 @@
                                       <ref role="3cqZAo" node="1EFtv_BA2_z" resolve="event" />
                                     </node>
                                     <node concept="liA8E" id="1EFtv_BA2Bx" role="2OqNvi">
-                                      <ref role="37wK5l" to="z60i:~AWTEvent.getID():int" resolve="getID" />
+                                      <ref role="37wK5l" to="z60i:~AWTEvent.getID()" resolve="getID" />
                                     </node>
                                   </node>
                                   <node concept="2OqwBi" id="1EFtv_BA2By" role="37wK5m">
@@ -5264,7 +5264,7 @@
                                       <ref role="3cqZAo" node="1EFtv_BA2_z" resolve="event" />
                                     </node>
                                     <node concept="liA8E" id="1EFtv_BA2B$" role="2OqNvi">
-                                      <ref role="37wK5l" to="hyam:~InputEvent.getWhen():long" resolve="getWhen" />
+                                      <ref role="37wK5l" to="hyam:~InputEvent.getWhen()" resolve="getWhen" />
                                     </node>
                                   </node>
                                   <node concept="2OqwBi" id="1EFtv_BA2B_" role="37wK5m">
@@ -5272,7 +5272,7 @@
                                       <ref role="3cqZAo" node="1EFtv_BA2_z" resolve="event" />
                                     </node>
                                     <node concept="liA8E" id="1EFtv_BA2BB" role="2OqNvi">
-                                      <ref role="37wK5l" to="hyam:~InputEvent.getModifiers():int" resolve="getModifiers" />
+                                      <ref role="37wK5l" to="hyam:~InputEvent.getModifiers()" resolve="getModifiers" />
                                     </node>
                                   </node>
                                   <node concept="2OqwBi" id="1EFtv_BA2BC" role="37wK5m">
@@ -5296,7 +5296,7 @@
                                       <ref role="3cqZAo" node="1EFtv_BA2_z" resolve="event" />
                                     </node>
                                     <node concept="liA8E" id="1EFtv_BA2BK" role="2OqNvi">
-                                      <ref role="37wK5l" to="hyam:~MouseEvent.getXOnScreen():int" resolve="getXOnScreen" />
+                                      <ref role="37wK5l" to="hyam:~MouseEvent.getXOnScreen()" resolve="getXOnScreen" />
                                     </node>
                                   </node>
                                   <node concept="2OqwBi" id="1EFtv_BA2BL" role="37wK5m">
@@ -5304,7 +5304,7 @@
                                       <ref role="3cqZAo" node="1EFtv_BA2_z" resolve="event" />
                                     </node>
                                     <node concept="liA8E" id="1EFtv_BA2BN" role="2OqNvi">
-                                      <ref role="37wK5l" to="hyam:~MouseEvent.getYOnScreen():int" resolve="getYOnScreen" />
+                                      <ref role="37wK5l" to="hyam:~MouseEvent.getYOnScreen()" resolve="getYOnScreen" />
                                     </node>
                                   </node>
                                   <node concept="2OqwBi" id="1EFtv_BA2BO" role="37wK5m">
@@ -5312,7 +5312,7 @@
                                       <ref role="3cqZAo" node="1EFtv_BA2_z" resolve="event" />
                                     </node>
                                     <node concept="liA8E" id="1EFtv_BA2BQ" role="2OqNvi">
-                                      <ref role="37wK5l" to="hyam:~MouseEvent.getClickCount():int" resolve="getClickCount" />
+                                      <ref role="37wK5l" to="hyam:~MouseEvent.getClickCount()" resolve="getClickCount" />
                                     </node>
                                   </node>
                                   <node concept="2OqwBi" id="1EFtv_BA2BR" role="37wK5m">
@@ -5320,7 +5320,7 @@
                                       <ref role="3cqZAo" node="1EFtv_BA2_z" resolve="event" />
                                     </node>
                                     <node concept="liA8E" id="1EFtv_BA2BT" role="2OqNvi">
-                                      <ref role="37wK5l" to="hyam:~MouseEvent.isPopupTrigger():boolean" resolve="isPopupTrigger" />
+                                      <ref role="37wK5l" to="hyam:~MouseEvent.isPopupTrigger()" resolve="isPopupTrigger" />
                                     </node>
                                   </node>
                                   <node concept="2OqwBi" id="1EFtv_BA2BU" role="37wK5m">
@@ -5328,7 +5328,7 @@
                                       <ref role="3cqZAo" node="1EFtv_BA2_z" resolve="event" />
                                     </node>
                                     <node concept="liA8E" id="1EFtv_BA2BW" role="2OqNvi">
-                                      <ref role="37wK5l" to="hyam:~MouseEvent.getButton():int" resolve="getButton" />
+                                      <ref role="37wK5l" to="hyam:~MouseEvent.getButton()" resolve="getButton" />
                                     </node>
                                   </node>
                                 </node>
@@ -5371,7 +5371,7 @@
         </node>
         <node concept="3clFbF" id="5pDu2jaIeM4" role="3cqZAp">
           <node concept="1rXfSq" id="5pDu2jaIeM3" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Component.addMouseListener(java.awt.event.MouseListener):void" resolve="addMouseListener" />
+            <ref role="37wK5l" to="z60i:~Component.addMouseListener(java.awt.event.MouseListener)" resolve="addMouseListener" />
             <node concept="2OqwBi" id="1EFtv_BA2C7" role="37wK5m">
               <node concept="Xjq3P" id="1EFtv_BA2C8" role="2Oq$k0" />
               <node concept="2OwXpG" id="1EFtv_BA2C9" role="2OqNvi">
@@ -5406,7 +5406,7 @@
               <ref role="37wK5l" node="4VwaB4LCeYW" resolve="ActionableTreeTable.Renderer" />
               <node concept="Xjq3P" id="4VwaB4LD77D" role="37wK5m" />
               <node concept="1rXfSq" id="4VwaB4LD9yh" role="37wK5m">
-                <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
               </node>
             </node>
           </node>
@@ -5678,7 +5678,7 @@
             </node>
             <node concept="3y3z36" id="6kREIVlbrUl" role="3clFbw">
               <node concept="1rXfSq" id="6kREIVlbvfr" role="3uHU7w">
-                <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
               </node>
               <node concept="37vLTw" id="6kREIVlbp2Y" role="3uHU7B">
                 <ref role="3cqZAo" node="6kREIVlal0i" resolve="origTree" />
@@ -5688,7 +5688,7 @@
           <node concept="3clFbH" id="6kREIVlcogR" role="3cqZAp" />
           <node concept="3cpWs6" id="6kREIVl6P92" role="3cqZAp">
             <node concept="3nyPlj" id="4VwaB4LBxI9" role="3cqZAk">
-              <ref role="37wK5l" to="u30n:~TreeTableCellRenderer.getTableCellRendererComponent(javax.swing.JTable,java.lang.Object,boolean,boolean,int,int):java.awt.Component" resolve="getTableCellRendererComponent" />
+              <ref role="37wK5l" to="u30n:~TreeTableCellRenderer.getTableCellRendererComponent(javax.swing.JTable,java.lang.Object,boolean,boolean,int,int)" resolve="getTableCellRendererComponent" />
               <node concept="37vLTw" id="4VwaB4LBxI3" role="37wK5m">
                 <ref role="3cqZAo" node="4VwaB4LBxHP" resolve="table" />
               </node>
@@ -6573,7 +6573,7 @@
                 <node concept="1pGfFk" id="6QkkSolGRkW" role="2ShVmc">
                   <ref role="37wK5l" node="6QkkSolg2tt" resolve="TableCellInfo" />
                   <node concept="2YIFZM" id="6QkkSolGREd" role="37wK5m">
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="1LFfDK" id="6QkkSolGRkX" role="37wK5m">
                       <node concept="3cmrfG" id="6QkkSolGRkY" role="1LF_Uc">
@@ -7002,7 +7002,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="6QkkSolHbJZ" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="A3Dl8" id="6QkkSolHbK0" role="10QFUM">
@@ -7349,7 +7349,7 @@
                     <ref role="3cqZAo" node="3mz2_dYbpQw" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYcddA" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments()" resolve="arguments" />
                   </node>
                 </node>
               </node>
@@ -7384,7 +7384,7 @@
                   <ref role="3cqZAo" node="3mz2_dYeZLV" resolve="original" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYf1Xs" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                  <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
                 </node>
               </node>
               <node concept="1rXfSq" id="3mz2_dYeZM4" role="37wK5m">
@@ -7394,7 +7394,7 @@
                     <ref role="3cqZAo" node="3mz2_dYeZLV" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYeZM7" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadKept()" resolve="matchHeadKept" />
                   </node>
                 </node>
               </node>
@@ -7405,7 +7405,7 @@
                     <ref role="3cqZAo" node="3mz2_dYeZLV" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYf24v" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadReplaced()" resolve="matchHeadReplaced" />
                   </node>
                 </node>
               </node>
@@ -7445,7 +7445,7 @@
                     <ref role="3cqZAo" node="3mz2_dYekXZ" resolve="original" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYekYb" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
               </node>
@@ -7490,7 +7490,7 @@
                     <ref role="3cqZAo" node="3mz2_dYc9vN" resolve="original" />
                   </node>
                   <node concept="liA8E" id="19wqdqOsLT3" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                   </node>
                 </node>
               </node>
@@ -7501,7 +7501,7 @@
                     <ref role="3cqZAo" node="3mz2_dYc9vN" resolve="original" />
                   </node>
                   <node concept="liA8E" id="19wqdqOsLT7" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                   </node>
                 </node>
               </node>
@@ -8352,7 +8352,7 @@
                 <ref role="3cqZAo" node="3mz2_dYazRU" resolve="original" />
               </node>
               <node concept="liA8E" id="3mz2_dYa_QT" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
+                <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint()" resolve="constraint" />
               </node>
             </node>
           </node>
@@ -8518,7 +8518,7 @@
                 <ref role="3cqZAo" node="3mz2_dYei3Z" resolve="originalInvocation" />
               </node>
               <node concept="liA8E" id="3mz2_dYejnN" role="2OqNvi">
-                <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
               </node>
             </node>
           </node>
@@ -8688,7 +8688,7 @@
                     <ref role="3cqZAo" node="1a9$hHAD4WN" resolve="original" />
                   </node>
                   <node concept="liA8E" id="1a9$hHAFnvR" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                   </node>
                 </node>
               </node>
@@ -8707,7 +8707,7 @@
                   <ref role="3cqZAo" node="1a9$hHAD4WN" resolve="original" />
                 </node>
                 <node concept="liA8E" id="1EFtv_BFlzG" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.isWildcard():boolean" resolve="isWildcard" />
+                  <ref role="37wK5l" to="bj13:~Logical.isWildcard()" resolve="isWildcard" />
                 </node>
               </node>
             </node>
@@ -8783,7 +8783,7 @@
                 <ref role="3cqZAo" node="3mz2_dYbi8c" resolve="originalLogical" />
               </node>
               <node concept="liA8E" id="3mz2_dYbjAO" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.name():java.lang.String" resolve="name" />
+                <ref role="37wK5l" to="bj13:~Logical.name()" resolve="name" />
               </node>
             </node>
           </node>
@@ -8820,7 +8820,7 @@
                     <ref role="3cqZAo" node="3mz2_dYbm9n" resolve="rootSnapshot" />
                   </node>
                   <node concept="liA8E" id="3mz2_dYbPII" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                   </node>
                 </node>
               </node>
@@ -8920,7 +8920,7 @@
                         <ref role="3cqZAo" node="3mz2_dYbm9n" resolve="rootSnapshot" />
                       </node>
                       <node concept="liA8E" id="1a9$hHAF2J4" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                       </node>
                     </node>
                     <node concept="3cpWs3" id="1a9$hHAF2J5" role="3uHU7B">
@@ -9068,7 +9068,7 @@
                     <ref role="3cqZAo" node="3mz2_dYbgrs" resolve="original" />
                   </node>
                   <node concept="liA8E" id="6Uh0cilnInV" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                   </node>
                 </node>
               </node>
@@ -9117,7 +9117,7 @@
                         <ref role="3cqZAo" node="3mz2_dYbm9n" resolve="rootSnapshot" />
                       </node>
                       <node concept="liA8E" id="6Uh0cil6CTE" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                        <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                       </node>
                     </node>
                     <node concept="3cpWs3" id="6Uh0cil6yVi" role="3uHU7B">
@@ -9242,7 +9242,7 @@
                 <ref role="3cqZAo" node="3wxtToDVvlt" resolve="snapshots" />
               </node>
               <node concept="liA8E" id="3wxtToDQAYh" role="2OqNvi">
-                <ref role="37wK5l" to="6rp1:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
+                <ref role="37wK5l" to="6rp1:~Map.get(java.lang.Object)" resolve="get" />
                 <node concept="2ShNRf" id="3wxtToDZuS_" role="37wK5m">
                   <node concept="1pGfFk" id="3wxtToDZxLF" role="2ShVmc">
                     <ref role="37wK5l" to="bid0:~Id.&lt;init&gt;(java.lang.Object)" resolve="Id" />
@@ -9289,7 +9289,7 @@
                 </node>
               </node>
               <node concept="2YIFZM" id="3wxtToDZgRB" role="37vLTx">
-                <ref role="37wK5l" to="6rp1:~Maps.of():com.github.andrewoma.dexx.collection.Map" resolve="of" />
+                <ref role="37wK5l" to="6rp1:~Maps.of()" resolve="of" />
                 <ref role="1Pybhc" to="6rp1:~Maps" resolve="Maps" />
               </node>
             </node>
@@ -9411,7 +9411,7 @@
                     <ref role="3cqZAo" node="3wxtToDPrMT" resolve="snapshots" />
                   </node>
                   <node concept="liA8E" id="3wxtToDPCGE" role="2OqNvi">
-                    <ref role="37wK5l" to="6rp1:~Map.put(java.lang.Object,java.lang.Object):com.github.andrewoma.dexx.collection.Map" resolve="put" />
+                    <ref role="37wK5l" to="6rp1:~Map.put(java.lang.Object,java.lang.Object)" resolve="put" />
                     <node concept="2ShNRf" id="3wxtToDZiI1" role="37wK5m">
                       <node concept="1pGfFk" id="3wxtToDZmkj" role="2ShVmc">
                         <ref role="37wK5l" to="bid0:~Id.&lt;init&gt;(java.lang.Object)" resolve="Id" />
@@ -9645,7 +9645,7 @@
                 <ref role="3cqZAo" node="4VwaB4L_Oeg" resolve="coloredComponent" />
               </node>
               <node concept="liA8E" id="4VwaB4L_PZw" role="2OqNvi">
-                <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.findFragmentAt(int):int" resolve="findFragmentAt" />
+                <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.findFragmentAt(int)" resolve="findFragmentAt" />
                 <node concept="10QFUN" id="4VwaB4L_Pym" role="37wK5m">
                   <node concept="10Oyi0" id="4VwaB4L_Pyn" role="10QFUM" />
                   <node concept="2OqwBi" id="4VwaB4L_Pyo" role="10QFUP">
@@ -9653,7 +9653,7 @@
                       <ref role="3cqZAo" node="4VwaB4L_Pyd" resolve="point" />
                     </node>
                     <node concept="liA8E" id="4VwaB4L_Pyq" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Point.getX():double" resolve="getX" />
+                      <ref role="37wK5l" to="z60i:~Point.getX()" resolve="getX" />
                     </node>
                   </node>
                 </node>
@@ -9678,7 +9678,7 @@
                   <ref role="3cqZAo" node="4VwaB4L_PyL" resolve="it" />
                 </node>
                 <node concept="liA8E" id="4VwaB4L_Py$" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                  <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                 </node>
               </node>
             </node>
@@ -9691,7 +9691,7 @@
                         <ref role="3cqZAo" node="4VwaB4L_PyL" resolve="it" />
                       </node>
                       <node concept="liA8E" id="4VwaB4L_PyF" role="2OqNvi">
-                        <ref role="37wK5l" to="lzb2:~SimpleColoredComponent$ColoredIterator.getTextAttributes():com.intellij.ui.SimpleTextAttributes" resolve="getTextAttributes" />
+                        <ref role="37wK5l" to="lzb2:~SimpleColoredComponent$ColoredIterator.getTextAttributes()" resolve="getTextAttributes" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="4VwaB4L_PyG" role="37vLTJ">
@@ -9721,7 +9721,7 @@
                 <ref role="3cqZAo" node="4VwaB4L_Oeg" resolve="coloredComponent" />
               </node>
               <node concept="liA8E" id="4VwaB4L_QoR" role="2OqNvi">
-                <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.iterator():com.intellij.ui.SimpleColoredComponent$ColoredIterator" resolve="iterator" />
+                <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.iterator()" resolve="iterator" />
               </node>
             </node>
           </node>
@@ -9739,7 +9739,7 @@
                 <ref role="3cqZAo" node="4VwaB4L_PyL" resolve="it" />
               </node>
               <node concept="liA8E" id="4VwaB4L_PyU" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
               </node>
             </node>
           </node>
@@ -9768,7 +9768,7 @@
                       <ref role="3cqZAo" node="4VwaB4L_Pys" resolve="textAttributes" />
                     </node>
                     <node concept="liA8E" id="4VwaB4L_Pz8" role="2OqNvi">
-                      <ref role="37wK5l" to="lzb2:~SimpleTextAttributes.getStyle():int" resolve="getStyle" />
+                      <ref role="37wK5l" to="lzb2:~SimpleTextAttributes.getStyle()" resolve="getStyle" />
                     </node>
                   </node>
                   <node concept="10M0yZ" id="4VwaB4L_Pz9" role="3uHU7w">
@@ -9814,13 +9814,13 @@
                   <ref role="3cqZAo" node="4VwaB4LAgML" resolve="event" />
                 </node>
                 <node concept="liA8E" id="4VwaB4LAgMY" role="2OqNvi">
-                  <ref role="37wK5l" to="hyam:~MouseEvent.getPoint():java.awt.Point" resolve="getPoint" />
+                  <ref role="37wK5l" to="hyam:~MouseEvent.getPoint()" resolve="getPoint" />
                 </node>
               </node>
             </node>
             <node concept="2YIFZM" id="4VwaB4LAgMZ" role="3uHU7B">
               <ref role="1Pybhc" to="g1qu:~UIUtil" resolve="UIUtil" />
-              <ref role="37wK5l" to="g1qu:~UIUtil.isActionClick(java.awt.event.MouseEvent,int):boolean" resolve="isActionClick" />
+              <ref role="37wK5l" to="g1qu:~UIUtil.isActionClick(java.awt.event.MouseEvent,int)" resolve="isActionClick" />
               <node concept="37vLTw" id="4VwaB4LAgN0" role="37wK5m">
                 <ref role="3cqZAo" node="4VwaB4LAgML" resolve="event" />
               </node>
@@ -9852,7 +9852,7 @@
               <ref role="3cqZAo" node="4VwaB4L_R6v" resolve="myListeners" />
             </node>
             <node concept="liA8E" id="4VwaB4LAqK3" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+              <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
               <node concept="37vLTw" id="4VwaB4LAqK4" role="37wK5m">
                 <ref role="3cqZAo" node="4VwaB4LAqJX" resolve="listener" />
               </node>
@@ -9882,7 +9882,7 @@
               <ref role="3cqZAo" node="4VwaB4L_R6v" resolve="myListeners" />
             </node>
             <node concept="liA8E" id="4VwaB4LAqKf" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.remove(java.lang.Object):boolean" resolve="remove" />
+              <ref role="37wK5l" to="33ny:~List.remove(java.lang.Object)" resolve="remove" />
               <node concept="37vLTw" id="4VwaB4LAqKg" role="37wK5m">
                 <ref role="3cqZAo" node="4VwaB4LAqK9" resolve="listener" />
               </node>
@@ -9938,7 +9938,7 @@
                   <ref role="3cqZAo" node="4VwaB4LAra$" resolve="listener" />
                 </node>
                 <node concept="liA8E" id="4VwaB4LAraE" role="2OqNvi">
-                  <ref role="37wK5l" to="gsia:~HyperlinkListener.hyperlinkUpdate(javax.swing.event.HyperlinkEvent):void" resolve="hyperlinkUpdate" />
+                  <ref role="37wK5l" to="gsia:~HyperlinkListener.hyperlinkUpdate(javax.swing.event.HyperlinkEvent)" resolve="hyperlinkUpdate" />
                   <node concept="37vLTw" id="4VwaB4LAraF" role="37wK5m">
                     <ref role="3cqZAo" node="4VwaB4LAraq" resolve="e" />
                   </node>
@@ -10011,9 +10011,9 @@
                   <ref role="3cqZAo" node="4VwaB4L_Oeg" resolve="coloredComponent" />
                 </node>
                 <node concept="liA8E" id="4VwaB4LAtfc" role="2OqNvi">
-                  <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.append(java.lang.String,com.intellij.ui.SimpleTextAttributes):void" resolve="append" />
+                  <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.append(java.lang.String,com.intellij.ui.SimpleTextAttributes)" resolve="append" />
                   <node concept="2YIFZM" id="62MNP_l5uQm" role="37wK5m">
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="37vLTw" id="62MNP_l7xqF" role="37wK5m">
                       <ref role="3cqZAo" node="62MNP_l7xqB" resolve="text" />
@@ -10060,9 +10060,9 @@
                     <ref role="3cqZAo" node="4VwaB4L_Oeg" resolve="coloredComponent" />
                   </node>
                   <node concept="liA8E" id="4VwaB4LAu8n" role="2OqNvi">
-                    <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.append(java.lang.String,com.intellij.ui.SimpleTextAttributes):void" resolve="append" />
+                    <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.append(java.lang.String,com.intellij.ui.SimpleTextAttributes)" resolve="append" />
                     <node concept="2YIFZM" id="62MNP_l5uQq" role="37wK5m">
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                       <node concept="37vLTw" id="62MNP_l7xqG" role="37wK5m">
                         <ref role="3cqZAo" node="62MNP_l7xqB" resolve="text" />
@@ -10085,10 +10085,10 @@
                     <ref role="3cqZAo" node="4VwaB4L_Oeg" resolve="coloredComponent" />
                   </node>
                   <node concept="liA8E" id="7vxJ_H4m61l" role="2OqNvi">
-                    <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.append(java.lang.String,com.intellij.ui.SimpleTextAttributes):void" resolve="append" />
+                    <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.append(java.lang.String,com.intellij.ui.SimpleTextAttributes)" resolve="append" />
                     <node concept="2YIFZM" id="7vxJ_H4m61m" role="37wK5m">
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                       <node concept="37vLTw" id="7vxJ_H4m61n" role="37wK5m">
                         <ref role="3cqZAo" node="62MNP_l7xqB" resolve="text" />
                       </node>
@@ -10125,9 +10125,9 @@
                     <ref role="3cqZAo" node="4VwaB4L_Oeg" resolve="coloredComponent" />
                   </node>
                   <node concept="liA8E" id="3sb6Qlva4Gw" role="2OqNvi">
-                    <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.append(java.lang.String,com.intellij.ui.SimpleTextAttributes):void" resolve="append" />
+                    <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.append(java.lang.String,com.intellij.ui.SimpleTextAttributes)" resolve="append" />
                     <node concept="2YIFZM" id="3sb6Qlva4Gx" role="37wK5m">
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                       <node concept="37vLTw" id="3sb6Qlva4Gy" role="37wK5m">
                         <ref role="3cqZAo" node="62MNP_l7xqB" resolve="text" />
@@ -10164,7 +10164,7 @@
               <ref role="3cqZAo" node="4VwaB4L_Oeg" resolve="coloredComponent" />
             </node>
             <node concept="liA8E" id="4VwaB4LAuYU" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JComponent.setToolTipText(java.lang.String):void" resolve="setToolTipText" />
+              <ref role="37wK5l" to="dxuu:~JComponent.setToolTipText(java.lang.String)" resolve="setToolTipText" />
               <node concept="1rXfSq" id="5TpjAH66yGj" role="37wK5m">
                 <ref role="37wK5l" node="5TpjAH65TfB" resolve="escapeHtml" />
                 <node concept="2EnYce" id="62MNP_l5uDs" role="37wK5m">
@@ -10278,7 +10278,7 @@
                             <ref role="3cqZAo" node="4VwaB4LAs5z" resolve="callback" />
                           </node>
                           <node concept="liA8E" id="4VwaB4LAs5Z" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~Runnable.run():void" resolve="run" />
+                            <ref role="37wK5l" to="wyt6:~Runnable.run()" resolve="run" />
                           </node>
                         </node>
                       </node>
@@ -10350,7 +10350,7 @@
                 <ref role="3cqZAo" node="5TpjAH65UcI" resolve="str" />
               </node>
               <node concept="liA8E" id="5TpjAH65V9r" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
               </node>
             </node>
           </node>
@@ -10365,7 +10365,7 @@
                     <ref role="3cqZAo" node="5TpjAH65UcI" resolve="str" />
                   </node>
                   <node concept="liA8E" id="5TpjAH65V9x" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                    <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                     <node concept="37vLTw" id="5TpjAH65V8a" role="37wK5m">
                       <ref role="3cqZAo" node="5TpjAH65V7X" resolve="idx" />
                     </node>
@@ -10449,7 +10449,7 @@
                                   <ref role="3cqZAo" node="5TpjAH65UcI" resolve="str" />
                                 </node>
                                 <node concept="liA8E" id="5TpjAH65V9T" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                  <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                   <node concept="3cmrfG" id="5TpjAH65V8w" role="37wK5m">
                                     <property role="3cmrfH" value="0" />
                                   </node>
@@ -10472,7 +10472,7 @@
                               <ref role="3cqZAo" node="5TpjAH65UcI" resolve="str" />
                             </node>
                             <node concept="liA8E" id="5TpjAH65V9Z" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                              <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                             </node>
                           </node>
                         </node>
@@ -10492,7 +10492,7 @@
                                   <ref role="3cqZAo" node="5TpjAH65UcI" resolve="str" />
                                 </node>
                                 <node concept="liA8E" id="5TpjAH65Va5" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                  <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                   <node concept="37vLTw" id="5TpjAH65V8M" role="37wK5m">
                                     <ref role="3cqZAo" node="5TpjAH65V7X" resolve="idx" />
                                   </node>
@@ -10511,7 +10511,7 @@
                                     <ref role="3cqZAo" node="5TpjAH65V8n" resolve="sb" />
                                   </node>
                                   <node concept="liA8E" id="5TpjAH65Vab" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(char):java.lang.StringBuilder" resolve="append" />
+                                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(char)" resolve="append" />
                                     <node concept="37vLTw" id="5TpjAH65V9d" role="37wK5m">
                                       <ref role="3cqZAo" node="5TpjAH65V86" resolve="c" />
                                     </node>
@@ -10530,7 +10530,7 @@
                                       <ref role="3cqZAo" node="5TpjAH65V8n" resolve="sb" />
                                     </node>
                                     <node concept="liA8E" id="5TpjAH65Vah" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                                       <node concept="Xl_RD" id="5TpjAH65V8V" role="37wK5m">
                                         <property role="Xl_RC" value="&amp;amp;" />
                                       </node>
@@ -10551,7 +10551,7 @@
                                       <ref role="3cqZAo" node="5TpjAH65V8n" resolve="sb" />
                                     </node>
                                     <node concept="liA8E" id="5TpjAH65Van" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                                       <node concept="Xl_RD" id="5TpjAH65V92" role="37wK5m">
                                         <property role="Xl_RC" value="&amp;lt;" />
                                       </node>
@@ -10572,7 +10572,7 @@
                                       <ref role="3cqZAo" node="5TpjAH65V8n" resolve="sb" />
                                     </node>
                                     <node concept="liA8E" id="5TpjAH65Vat" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                                       <node concept="Xl_RD" id="5TpjAH65V99" role="37wK5m">
                                         <property role="Xl_RC" value="&amp;gt;" />
                                       </node>
@@ -10593,7 +10593,7 @@
                         <ref role="3cqZAo" node="5TpjAH65V8n" resolve="sb" />
                       </node>
                       <node concept="liA8E" id="5TpjAH65Vaz" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+                        <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
                       </node>
                     </node>
                   </node>
@@ -10645,7 +10645,7 @@
       </node>
       <node concept="2YIFZM" id="4VwaB4L_R6y" role="33vP2m">
         <ref role="1Pybhc" to="e8no:~ContainerUtil" resolve="ContainerUtil" />
-        <ref role="37wK5l" to="e8no:~ContainerUtil.createLockFreeCopyOnWriteList():java.util.List" resolve="createLockFreeCopyOnWriteList" />
+        <ref role="37wK5l" to="e8no:~ContainerUtil.createLockFreeCopyOnWriteList()" resolve="createLockFreeCopyOnWriteList" />
       </node>
       <node concept="3Tm6S6" id="4VwaB4L_R6z" role="1B3o_S" />
     </node>
@@ -10726,7 +10726,7 @@
                   <ref role="3cqZAo" node="19wqdqO0ZRR" resolve="run" />
                 </node>
                 <node concept="liA8E" id="19wqdqO10WM" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Runnable.run():void" resolve="run" />
+                  <ref role="37wK5l" to="wyt6:~Runnable.run()" resolve="run" />
                 </node>
               </node>
             </node>
@@ -10749,7 +10749,7 @@
                   </node>
                   <node concept="3clFbF" id="19wqdqO101A" role="3cqZAp">
                     <node concept="2YIFZM" id="19wqdqO101B" role="3clFbG">
-                      <ref role="37wK5l" to="7ce3:~Exceptions.throwIfFatal(java.lang.Throwable):void" resolve="throwIfFatal" />
+                      <ref role="37wK5l" to="7ce3:~Exceptions.throwIfFatal(java.lang.Throwable)" resolve="throwIfFatal" />
                       <ref role="1Pybhc" to="7ce3:~Exceptions" resolve="Exceptions" />
                       <node concept="37vLTw" id="19wqdqO101C" role="37wK5m">
                         <ref role="3cqZAo" node="19wqdqO101v" resolve="e" />
@@ -10774,11 +10774,11 @@
                     <node concept="3clFbF" id="19wqdqO101K" role="3cqZAp">
                       <node concept="2OqwBi" id="19wqdqO101L" role="3clFbG">
                         <node concept="2YIFZM" id="19wqdqO101M" role="2Oq$k0">
-                          <ref role="37wK5l" to="al1t:~MessagePool.getInstance():com.intellij.diagnostic.MessagePool" resolve="getInstance" />
+                          <ref role="37wK5l" to="al1t:~MessagePool.getInstance()" resolve="getInstance" />
                           <ref role="1Pybhc" to="al1t:~MessagePool" resolve="MessagePool" />
                         </node>
                         <node concept="liA8E" id="19wqdqO101N" role="2OqNvi">
-                          <ref role="37wK5l" to="al1t:~MessagePool.addIdeFatalMessage(com.intellij.openapi.diagnostic.IdeaLoggingEvent):void" resolve="addIdeFatalMessage" />
+                          <ref role="37wK5l" to="al1t:~MessagePool.addIdeFatalMessage(com.intellij.openapi.diagnostic.IdeaLoggingEvent)" resolve="addIdeFatalMessage" />
                           <node concept="2ShNRf" id="19wqdqO101O" role="37wK5m">
                             <node concept="1pGfFk" id="19wqdqO101P" role="2ShVmc">
                               <ref role="37wK5l" to="uzhr:~IdeaLoggingEvent.&lt;init&gt;(java.lang.String,java.lang.Throwable)" resolve="IdeaLoggingEvent" />
@@ -10960,7 +10960,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="6bBjpI87abD" role="2OqNvi">
-                      <ref role="37wK5l" to="z1c4:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                      <ref role="37wK5l" to="z1c4:~MPSProject.getProject()" resolve="getProject" />
                     </node>
                   </node>
                   <node concept="LR4U6" id="7nPD14NbqKn" role="2OqNvi">
@@ -11327,7 +11327,7 @@
               <ref role="3cqZAo" node="7nPD14Nbx0U" resolve="tool" />
             </node>
             <node concept="liA8E" id="7nPD14NbGwg" role="2OqNvi">
-              <ref role="37wK5l" to="71xd:~BaseTool.openToolLater(boolean):void" resolve="openToolLater" />
+              <ref role="37wK5l" to="71xd:~BaseTool.openToolLater(boolean)" resolve="openToolLater" />
               <node concept="3clFbT" id="7nPD14NbGFr" role="37wK5m">
                 <property role="3clFbU" value="true" />
               </node>
@@ -11499,7 +11499,7 @@
               <ref role="3cqZAo" node="428_4iYyMTm" resolve="mpsProject" />
             </node>
             <node concept="liA8E" id="428_4iYyOoY" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -11542,13 +11542,13 @@
                       <ref role="3cqZAo" node="428_4iYyOp5" resolve="ref" />
                     </node>
                     <node concept="liA8E" id="428_4iYyOpj" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                      <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                       <node concept="2OqwBi" id="428_4iYyOpk" role="37wK5m">
                         <node concept="37vLTw" id="428_4iYyOpl" role="2Oq$k0">
                           <ref role="3cqZAo" node="428_4iYyMTm" resolve="mpsProject" />
                         </node>
                         <node concept="liA8E" id="428_4iYyOpm" role="2OqNvi">
-                          <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                          <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                         </node>
                       </node>
                     </node>
@@ -11585,7 +11585,7 @@
               <ref role="3cqZAo" node="428_4iYyMTm" resolve="mpsProject" />
             </node>
             <node concept="liA8E" id="428_4iYyOpz" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -11631,11 +11631,11 @@
                 <ref role="3cqZAo" node="428_4iYyMTm" resolve="mpsProject" />
               </node>
               <node concept="liA8E" id="428_4iYyOpT" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getModelAccess():org.jetbrains.mps.openapi.module.ModelAccess" resolve="getModelAccess" />
+                <ref role="37wK5l" to="z1c3:~Project.getModelAccess()" resolve="getModelAccess" />
               </node>
             </node>
             <node concept="liA8E" id="428_4iYyOpU" role="2OqNvi">
-              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess():void" resolve="checkReadAccess" />
+              <ref role="37wK5l" to="lui2:~ModelAccess.checkReadAccess()" resolve="checkReadAccess" />
             </node>
           </node>
         </node>
@@ -11663,7 +11663,7 @@
                       <ref role="3cqZAo" node="428_4iYyOpX" resolve="sb" />
                     </node>
                     <node concept="liA8E" id="428_4iYyOqc" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                       <node concept="2OqwBi" id="428_4iYyOqd" role="37wK5m">
                         <node concept="1eOMI4" id="428_4iYyOqe" role="2Oq$k0">
                           <node concept="10QFUN" id="428_4iYyOqf" role="1eOMHV">
@@ -11730,7 +11730,7 @@
                         <ref role="3uigEE" to="cj4x:~TextBuilder" resolve="TextBuilder" />
                       </node>
                       <node concept="2YIFZM" id="428_4iYyOqE" role="33vP2m">
-                        <ref role="37wK5l" to="eh3q:~TextRenderUtil.renderText(jetbrains.mps.openapi.editor.selection.Selection):jetbrains.mps.openapi.editor.TextBuilder" resolve="renderText" />
+                        <ref role="37wK5l" to="eh3q:~TextRenderUtil.renderText(jetbrains.mps.openapi.editor.selection.Selection)" resolve="renderText" />
                         <ref role="1Pybhc" to="eh3q:~TextRenderUtil" resolve="TextRenderUtil" />
                         <node concept="37vLTw" id="428_4iYyOqF" role="37wK5m">
                           <ref role="3cqZAo" node="428_4iYyOqw" resolve="selection" />
@@ -11760,19 +11760,19 @@
                                       <ref role="3cqZAo" node="428_4iYyOqC" resolve="renderText" />
                                     </node>
                                     <node concept="liA8E" id="428_4iYyOqU" role="2OqNvi">
-                                      <ref role="37wK5l" to="cj4x:~TextBuilder.getLines():java.lang.Iterable" resolve="getLines" />
+                                      <ref role="37wK5l" to="cj4x:~TextBuilder.getLines()" resolve="getLines" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="428_4iYyOqV" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~Iterable.iterator():java.util.Iterator" resolve="iterator" />
+                                    <ref role="37wK5l" to="wyt6:~Iterable.iterator()" resolve="iterator" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="428_4iYyOqW" role="2OqNvi">
-                                  <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                                  <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="428_4iYyOqX" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~CharSequence.toString():java.lang.String" resolve="toString" />
+                                <ref role="37wK5l" to="wyt6:~CharSequence.toString()" resolve="toString" />
                               </node>
                             </node>
                           </node>
@@ -11791,7 +11791,7 @@
                           <ref role="3cqZAo" node="428_4iYyOqC" resolve="renderText" />
                         </node>
                         <node concept="liA8E" id="428_4iYyOr3" role="2OqNvi">
-                          <ref role="37wK5l" to="cj4x:~TextBuilder.getSize():int" resolve="getSize" />
+                          <ref role="37wK5l" to="cj4x:~TextBuilder.getSize()" resolve="getSize" />
                         </node>
                       </node>
                     </node>
@@ -11804,7 +11804,7 @@
                                 <ref role="3cqZAo" node="428_4iYyOqC" resolve="renderText" />
                               </node>
                               <node concept="liA8E" id="428_4iYyOra" role="2OqNvi">
-                                <ref role="37wK5l" to="cj4x:~TextBuilder.getText():java.lang.String" resolve="getText" />
+                                <ref role="37wK5l" to="cj4x:~TextBuilder.getText()" resolve="getText" />
                               </node>
                             </node>
                             <node concept="37vLTw" id="428_4iYyOrb" role="37vLTJ">
@@ -11824,7 +11824,7 @@
                           <ref role="3cqZAo" node="428_4iYyOqH" resolve="text" />
                         </node>
                         <node concept="liA8E" id="428_4iYyOrh" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.indexOf(java.lang.String):int" resolve="indexOf" />
+                          <ref role="37wK5l" to="wyt6:~String.indexOf(java.lang.String)" resolve="indexOf" />
                           <node concept="Xl_RD" id="428_4iYyOri" role="37wK5m">
                             <property role="Xl_RC" value="\n" />
                           </node>
@@ -11841,7 +11841,7 @@
                               <ref role="3cqZAo" node="428_4iYyOqH" resolve="text" />
                             </node>
                             <node concept="liA8E" id="428_4iYyOrp" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                              <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                               <node concept="3cmrfG" id="428_4iYyOrq" role="37wK5m">
                                 <property role="3cmrfH" value="0" />
                               </node>
@@ -11873,21 +11873,21 @@
                             <ref role="3cqZAo" node="428_4iYyOpX" resolve="sb" />
                           </node>
                           <node concept="liA8E" id="428_4iYyOr_" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                            <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                             <node concept="Xl_RD" id="428_4iYyOrA" role="37wK5m">
                               <property role="Xl_RC" value="`" />
                             </node>
                           </node>
                         </node>
                         <node concept="liA8E" id="428_4iYyOrB" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                          <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                           <node concept="37vLTw" id="428_4iYyOrC" role="37wK5m">
                             <ref role="3cqZAo" node="428_4iYyOqH" resolve="text" />
                           </node>
                         </node>
                       </node>
                       <node concept="liA8E" id="428_4iYyOrD" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                        <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                         <node concept="Xl_RD" id="428_4iYyOrE" role="37wK5m">
                           <property role="Xl_RC" value="`" />
                         </node>
@@ -11903,7 +11903,7 @@
                         <ref role="3cqZAo" node="428_4iYyVrW" resolve="editorComponent" />
                       </node>
                       <node concept="liA8E" id="428_4iYyOrK" role="2OqNvi">
-                        <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
+                        <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="428_4iYyOrL" role="3uHU7B">
@@ -11911,7 +11911,7 @@
                         <ref role="3cqZAo" node="428_4iYyOpE" resolve="snode" />
                       </node>
                       <node concept="liA8E" id="428_4iYyOrN" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
+                        <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
                       </node>
                     </node>
                   </node>
@@ -11923,7 +11923,7 @@
                           <ref role="3cqZAo" node="428_4iYyOpE" resolve="snode" />
                         </node>
                         <node concept="liA8E" id="428_4iYyOrT" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNode.getParent():org.jetbrains.mps.openapi.model.SNode" resolve="getParent" />
+                          <ref role="37wK5l" to="mhbf:~SNode.getParent()" resolve="getParent" />
                         </node>
                       </node>
                     </node>
@@ -11944,13 +11944,13 @@
                         <ref role="3cqZAo" node="428_4iYyOpX" resolve="sb" />
                       </node>
                       <node concept="liA8E" id="428_4iYyOs6" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                        <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                         <node concept="2OqwBi" id="428_4iYyOs7" role="37wK5m">
                           <node concept="37vLTw" id="428_4iYyOs8" role="2Oq$k0">
                             <ref role="3cqZAo" node="428_4iYyOpE" resolve="snode" />
                           </node>
                           <node concept="liA8E" id="428_4iYyOs9" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getPresentation():java.lang.String" resolve="getPresentation" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getPresentation()" resolve="getPresentation" />
                           </node>
                         </node>
                       </node>
@@ -11976,20 +11976,20 @@
                       <ref role="3cqZAo" node="428_4iYyOpX" resolve="sb" />
                     </node>
                     <node concept="liA8E" id="428_4iYyOsl" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                       <node concept="Xl_RD" id="428_4iYyOsm" role="37wK5m">
                         <property role="Xl_RC" value="ERROR: " />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="428_4iYyOsn" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="2OqwBi" id="428_4iYyOso" role="37wK5m">
                       <node concept="37vLTw" id="428_4iYyOsp" role="2Oq$k0">
                         <ref role="3cqZAo" node="428_4iYyOse" resolve="e" />
                       </node>
                       <node concept="liA8E" id="428_4iYyOsq" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                        <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                       </node>
                     </node>
                   </node>
@@ -12014,7 +12014,7 @@
               <ref role="3cqZAo" node="428_4iYyOpX" resolve="sb" />
             </node>
             <node concept="liA8E" id="428_4iYyOsy" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -12108,11 +12108,11 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="5cnt3vhgg7$" role="2OqNvi">
-                            <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
+                            <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint()" resolve="constraint" />
                           </node>
                         </node>
                         <node concept="liA8E" id="5cnt3vhgg7_" role="2OqNvi">
-                          <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                          <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                         </node>
                       </node>
                     </node>
@@ -12219,11 +12219,11 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="YGS68MEb_w" role="2OqNvi">
-                            <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
+                            <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint()" resolve="constraint" />
                           </node>
                         </node>
                         <node concept="liA8E" id="YGS68MEb_x" role="2OqNvi">
-                          <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                          <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                         </node>
                       </node>
                     </node>
@@ -12973,7 +12973,7 @@
                     <ref role="3cqZAo" node="YGS68MIBYT" resolve="root" />
                   </node>
                   <node concept="liA8E" id="YGS68MIBX3" role="2OqNvi">
-                    <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode):void" resolve="add" />
+                    <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode)" resolve="add" />
                     <node concept="37vLTw" id="YGS68MIBX4" role="37wK5m">
                       <ref role="3cqZAo" node="YGS68MIBWJ" resolve="symNode" />
                     </node>
@@ -13091,7 +13091,7 @@
                               <ref role="3cqZAo" node="YGS68MIBXk" resolve="occ" />
                             </node>
                             <node concept="liA8E" id="3sb6QlvdFW6" role="2OqNvi">
-                              <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
+                              <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments()" resolve="arguments" />
                             </node>
                           </node>
                         </node>
@@ -13163,7 +13163,7 @@
                                       <ref role="3cqZAo" node="3sb6QlvdzOn" resolve="logical" />
                                     </node>
                                     <node concept="liA8E" id="3sb6QlvdzOh" role="2OqNvi">
-                                      <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                                      <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                                     </node>
                                   </node>
                                   <node concept="2OqwBi" id="3sb6QlvdzOi" role="3uHU7B">
@@ -13171,7 +13171,7 @@
                                       <ref role="3cqZAo" node="3sb6QlvdzOl" resolve="selLogical" />
                                     </node>
                                     <node concept="liA8E" id="3sb6QlvdzOk" role="2OqNvi">
-                                      <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                                      <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                                     </node>
                                   </node>
                                 </node>
@@ -13295,11 +13295,11 @@
                       <ref role="3cqZAo" node="YGS68MIBXk" resolve="occ" />
                     </node>
                     <node concept="liA8E" id="YGS68MIBY5" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
+                      <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint()" resolve="constraint" />
                     </node>
                   </node>
                   <node concept="liA8E" id="YGS68MIBY6" role="2OqNvi">
-                    <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                    <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                   </node>
                 </node>
               </node>
@@ -13311,7 +13311,7 @@
                 <ref role="3cqZAo" node="YGS68MIBXX" resolve="parent" />
               </node>
               <node concept="liA8E" id="YGS68MIBYa" role="2OqNvi">
-                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode):void" resolve="add" />
+                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode)" resolve="add" />
                 <node concept="37vLTw" id="YGS68MIBYb" role="37wK5m">
                   <ref role="3cqZAo" node="YGS68MIBXu" resolve="occNode" />
                 </node>
@@ -13412,7 +13412,7 @@
                 <ref role="3cqZAo" node="YGS68MTdIK" resolve="occNode" />
               </node>
               <node concept="liA8E" id="YGS68MTdIi" role="2OqNvi">
-                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.setUserObject(java.lang.Object):void" resolve="setUserObject" />
+                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.setUserObject(java.lang.Object)" resolve="setUserObject" />
                 <node concept="1Ls8ON" id="YGS68MTdIk" role="37wK5m">
                   <node concept="1LFfDK" id="3wxtToDChDH" role="1Lso8e">
                     <node concept="3cmrfG" id="3wxtToDCi4O" role="1LF_Uc">
@@ -13490,7 +13490,7 @@
                 <ref role="3cqZAo" node="YGS68MNwvb" resolve="occNode" />
               </node>
               <node concept="liA8E" id="YGS68MNzHO" role="2OqNvi">
-                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.removeFromParent():void" resolve="removeFromParent" />
+                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.removeFromParent()" resolve="removeFromParent" />
               </node>
             </node>
           </node>
@@ -13968,7 +13968,7 @@
           <node concept="3clFbF" id="4VwaB4Lm0Rt" role="3cqZAp">
             <node concept="10QFUN" id="4VwaB4Lm27_" role="3clFbG">
               <node concept="3nyPlj" id="4VwaB4Lm27$" role="10QFUP">
-                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.getUserObject():java.lang.Object" resolve="getUserObject" />
+                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.getUserObject()" resolve="getUserObject" />
               </node>
               <node concept="16syzq" id="4VwaB4Lm2_L" role="10QFUM">
                 <ref role="16sUi3" node="4VwaB4Lm0tI" resolve="UserData" />
@@ -14993,7 +14993,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6RFuZEC6Ba3" role="2OqNvi">
-              <ref role="37wK5l" to="g1qu:~ColumnInfo.getName():java.lang.String" resolve="getName" />
+              <ref role="37wK5l" to="g1qu:~ColumnInfo.getName()" resolve="getName" />
             </node>
           </node>
         </node>
@@ -15028,7 +15028,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6RFuZEC6Bag" role="2OqNvi">
-              <ref role="37wK5l" to="g1qu:~ColumnInfo.getColumnClass():java.lang.Class" resolve="getColumnClass" />
+              <ref role="37wK5l" to="g1qu:~ColumnInfo.getColumnClass()" resolve="getColumnClass" />
             </node>
           </node>
         </node>
@@ -15061,7 +15061,7 @@
         <node concept="3clFbF" id="6RFuZEC6Baq" role="3cqZAp">
           <node concept="2OqwBi" id="6RFuZEC6Bar" role="3clFbG">
             <node concept="liA8E" id="6RFuZEC6Bav" role="2OqNvi">
-              <ref role="37wK5l" to="g1qu:~ColumnInfo.valueOf(java.lang.Object):java.lang.Object" resolve="valueOf" />
+              <ref role="37wK5l" to="g1qu:~ColumnInfo.valueOf(java.lang.Object)" resolve="valueOf" />
               <node concept="37vLTw" id="6RFuZEC6Baw" role="37wK5m">
                 <ref role="3cqZAo" node="6RFuZEC6Bal" resolve="object" />
               </node>
@@ -15197,7 +15197,7 @@
             <node concept="2OqwBi" id="3ZNrYIhJ4Y0" role="33vP2m">
               <node concept="Xjq3P" id="3ZNrYIhJ4Y1" role="2Oq$k0" />
               <node concept="liA8E" id="3ZNrYIhJ4Y2" role="2OqNvi">
-                <ref role="37wK5l" to="rgfa:~DefaultTreeModel.getRoot():java.lang.Object" resolve="getRoot" />
+                <ref role="37wK5l" to="rgfa:~DefaultTreeModel.getRoot()" resolve="getRoot" />
               </node>
             </node>
           </node>
@@ -15234,7 +15234,7 @@
                     <ref role="3cqZAo" node="3ZNrYIhJ4YV" resolve="it" />
                   </node>
                   <node concept="liA8E" id="3ZNrYIhJ4Yk" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~Enumeration.nextElement():java.lang.Object" resolve="nextElement" />
+                    <ref role="37wK5l" to="33ny:~Enumeration.nextElement()" resolve="nextElement" />
                   </node>
                 </node>
               </node>
@@ -15312,7 +15312,7 @@
                   <ref role="3cqZAo" node="3ZNrYIhJ4Yg" resolve="tp" />
                 </node>
                 <node concept="liA8E" id="3ZNrYIhJ4YP" role="2OqNvi">
-                  <ref role="37wK5l" to="rgfa:~TreePath.getPath():java.lang.Object[]" resolve="getPath" />
+                  <ref role="37wK5l" to="rgfa:~TreePath.getPath()" resolve="getPath" />
                 </node>
               </node>
             </node>
@@ -15346,7 +15346,7 @@
               <ref role="3cqZAo" node="3ZNrYIhJ4YV" resolve="it" />
             </node>
             <node concept="liA8E" id="3ZNrYIhJ4Z1" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Enumeration.hasMoreElements():boolean" resolve="hasMoreElements" />
+              <ref role="37wK5l" to="33ny:~Enumeration.hasMoreElements()" resolve="hasMoreElements" />
             </node>
           </node>
         </node>
@@ -15512,7 +15512,7 @@
                 <node concept="2OqwBi" id="3ZNrYIhJcMw" role="HW$Y0">
                   <node concept="Xjq3P" id="3ZNrYIhJcMx" role="2Oq$k0" />
                   <node concept="liA8E" id="3ZNrYIhJcMy" role="2OqNvi">
-                    <ref role="37wK5l" to="rgfa:~DefaultTreeModel.getRoot():java.lang.Object" resolve="getRoot" />
+                    <ref role="37wK5l" to="rgfa:~DefaultTreeModel.getRoot()" resolve="getRoot" />
                   </node>
                 </node>
               </node>
@@ -15609,7 +15609,7 @@
           <node concept="3clFbS" id="7vxJ_H4vV9z" role="3clFbx">
             <node concept="3cpWs6" id="7vxJ_H4vWJ9" role="3cqZAp">
               <node concept="2YIFZM" id="7vxJ_H4vZ8H" role="3cqZAk">
-                <ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
+                <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
                 <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                 <node concept="3uibUv" id="7vxJ_H4wWBl" role="3PaCim">
                   <ref role="3uigEE" to="33ny:~List" resolve="List" />
@@ -15706,7 +15706,7 @@
                       <ref role="3cqZAo" node="7vxJ_H4xlCw" resolve="path" />
                     </node>
                     <node concept="liA8E" id="7vxJ_H4xncg" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                       <node concept="37vLTw" id="7vxJ_H4xnte" role="37wK5m">
                         <ref role="3cqZAo" node="7vxJ_H4x6Pd" resolve="node" />
                       </node>
@@ -15720,7 +15720,7 @@
                         <ref role="3cqZAo" node="7vxJ_H4x6Pd" resolve="node" />
                       </node>
                       <node concept="liA8E" id="7vxJ_H4xoTe" role="2OqNvi">
-                        <ref role="37wK5l" to="rgfa:~TreeNode.getParent():javax.swing.tree.TreeNode" resolve="getParent" />
+                        <ref role="37wK5l" to="rgfa:~TreeNode.getParent()" resolve="getParent" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="7vxJ_H4xo_U" role="37vLTJ">
@@ -15738,7 +15738,7 @@
             </node>
             <node concept="3clFbF" id="7vxJ_H4xrhR" role="3cqZAp">
               <node concept="2YIFZM" id="7vxJ_H4xryZ" role="3clFbG">
-                <ref role="37wK5l" to="33ny:~Collections.reverse(java.util.List):void" resolve="reverse" />
+                <ref role="37wK5l" to="33ny:~Collections.reverse(java.util.List)" resolve="reverse" />
                 <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                 <node concept="37vLTw" id="7vxJ_H4xrK9" role="37wK5m">
                   <ref role="3cqZAo" node="7vxJ_H4xlCw" resolve="path" />
@@ -16021,7 +16021,7 @@
       <node concept="3clFbS" id="5IQCpeN1GYO" role="3clF47">
         <node concept="3clFbF" id="5IQCpeN3R_6" role="3cqZAp">
           <node concept="3nyPlj" id="5IQCpeN3R_7" role="3clFbG">
-            <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.append(java.lang.String,com.intellij.ui.SimpleTextAttributes,boolean):void" resolve="append" />
+            <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.append(java.lang.String,com.intellij.ui.SimpleTextAttributes,boolean)" resolve="append" />
             <node concept="37vLTw" id="5IQCpeN3R_8" role="37wK5m">
               <ref role="3cqZAo" node="5IQCpeN1GYG" resolve="fragment" />
             </node>
@@ -16030,7 +16030,7 @@
                 <ref role="3cqZAo" node="5IQCpeMYoS2" resolve="tableCellState" />
               </node>
               <node concept="liA8E" id="5IQCpeN4SV7" role="2OqNvi">
-                <ref role="37wK5l" to="lzb2:~TableCellState.modifyAttributes(com.intellij.ui.SimpleTextAttributes):com.intellij.ui.SimpleTextAttributes" resolve="modifyAttributes" />
+                <ref role="37wK5l" to="lzb2:~TableCellState.modifyAttributes(com.intellij.ui.SimpleTextAttributes)" resolve="modifyAttributes" />
                 <node concept="37vLTw" id="5IQCpeN4SV8" role="37wK5m">
                   <ref role="3cqZAo" node="5IQCpeN1GYJ" resolve="attributes" />
                 </node>
@@ -16111,7 +16111,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5IQCpeMZYay" role="2OqNvi">
-                <ref role="37wK5l" to="u30n:~TreeTableTree.getTreeTable():com.intellij.ui.treeStructure.treetable.TreeTable" resolve="getTreeTable" />
+                <ref role="37wK5l" to="u30n:~TreeTableTree.getTreeTable()" resolve="getTreeTable" />
               </node>
             </node>
           </node>
@@ -16119,7 +16119,7 @@
         <node concept="3clFbH" id="5IQCpeN0CJg" role="3cqZAp" />
         <node concept="3clFbF" id="5IQCpeMZXLc" role="3cqZAp">
           <node concept="1rXfSq" id="5IQCpeMZXLd" role="3clFbG">
-            <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.clear():void" resolve="clear" />
+            <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.clear()" resolve="clear" />
           </node>
         </node>
         <node concept="3clFbJ" id="5IQCpeN0520" role="3cqZAp">
@@ -16132,7 +16132,7 @@
                       <ref role="3cqZAo" node="5IQCpeMZXh0" resolve="tree" />
                     </node>
                     <node concept="liA8E" id="5IQCpeN0NRt" role="2OqNvi">
-                      <ref role="37wK5l" to="dxuu:~JTree.getUI():javax.swing.plaf.TreeUI" resolve="getUI" />
+                      <ref role="37wK5l" to="dxuu:~JTree.getUI()" resolve="getUI" />
                     </node>
                   </node>
                   <node concept="3uibUv" id="5IQCpeN0NRu" role="2ZW6by">
@@ -16147,7 +16147,7 @@
                           <ref role="3cqZAo" node="5IQCpeMZXh0" resolve="tree" />
                         </node>
                         <node concept="liA8E" id="5IQCpeN0NR$" role="2OqNvi">
-                          <ref role="37wK5l" to="dxuu:~JTree.getUI():javax.swing.plaf.TreeUI" resolve="getUI" />
+                          <ref role="37wK5l" to="dxuu:~JTree.getUI()" resolve="getUI" />
                         </node>
                       </node>
                       <node concept="3uibUv" id="5IQCpeN0NR_" role="10QFUM">
@@ -16156,7 +16156,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="5IQCpeN0NRA" role="2OqNvi">
-                    <ref role="37wK5l" to="e2ly:~WideSelectionTreeUI.isWideSelection():boolean" resolve="isWideSelection" />
+                    <ref role="37wK5l" to="e2ly:~WideSelectionTreeUI.isWideSelection()" resolve="isWideSelection" />
                   </node>
                 </node>
               </node>
@@ -16165,7 +16165,7 @@
           <node concept="3clFbS" id="5IQCpeN0Lpn" role="3clFbx">
             <node concept="3clFbF" id="5IQCpeN0HJ_" role="3cqZAp">
               <node concept="1rXfSq" id="5IQCpeN0HJA" role="3clFbG">
-                <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.setPaintFocusBorder(boolean):void" resolve="setPaintFocusBorder" />
+                <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.setPaintFocusBorder(boolean)" resolve="setPaintFocusBorder" />
                 <node concept="1Wc70l" id="5IQCpeN0HJB" role="37wK5m">
                   <node concept="37vLTw" id="5IQCpeN0HJC" role="3uHU7B">
                     <ref role="3cqZAo" node="5IQCpeMZXhd" resolve="hasFocus" />
@@ -16175,7 +16175,7 @@
                       <ref role="3cqZAo" node="5IQCpeMZYar" resolve="table" />
                     </node>
                     <node concept="liA8E" id="5IQCpeN0HJF" role="2OqNvi">
-                      <ref role="37wK5l" to="dxuu:~JTable.getCellSelectionEnabled():boolean" resolve="getCellSelectionEnabled" />
+                      <ref role="37wK5l" to="dxuu:~JTable.getCellSelectionEnabled()" resolve="getCellSelectionEnabled" />
                     </node>
                   </node>
                 </node>
@@ -16187,7 +16187,7 @@
             <node concept="3clFbS" id="5IQCpeN052c" role="9aQI4">
               <node concept="3clFbF" id="5IQCpeMZXLe" role="3cqZAp">
                 <node concept="1rXfSq" id="5IQCpeMZXLf" role="3clFbG">
-                  <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.setPaintFocusBorder(boolean):void" resolve="setPaintFocusBorder" />
+                  <ref role="37wK5l" to="lzb2:~SimpleColoredComponent.setPaintFocusBorder(boolean)" resolve="setPaintFocusBorder" />
                   <node concept="3clFbT" id="5IQCpeN0SnA" role="37wK5m">
                     <property role="3clFbU" value="false" />
                   </node>
@@ -16204,7 +16204,7 @@
               <ref role="3cqZAo" node="5IQCpeMYoS2" resolve="tableCellState" />
             </node>
             <node concept="liA8E" id="5IQCpeMZYaA" role="2OqNvi">
-              <ref role="37wK5l" to="lzb2:~TableCellState.collectState(javax.swing.JTable,boolean,boolean,int,int):void" resolve="collectState" />
+              <ref role="37wK5l" to="lzb2:~TableCellState.collectState(javax.swing.JTable,boolean,boolean,int,int)" resolve="collectState" />
               <node concept="37vLTw" id="5IQCpeMZYaB" role="37wK5m">
                 <ref role="3cqZAo" node="5IQCpeMZYar" resolve="table" />
               </node>
@@ -16229,7 +16229,7 @@
               <ref role="3cqZAo" node="5IQCpeMYoS2" resolve="tableCellState" />
             </node>
             <node concept="liA8E" id="5IQCpeMZYaJ" role="2OqNvi">
-              <ref role="37wK5l" to="lzb2:~TableCellState.updateRenderer(javax.swing.JComponent):void" resolve="updateRenderer" />
+              <ref role="37wK5l" to="lzb2:~TableCellState.updateRenderer(javax.swing.JComponent)" resolve="updateRenderer" />
               <node concept="Xjq3P" id="5IQCpeMZYaK" role="37wK5m" />
             </node>
           </node>
@@ -16425,13 +16425,13 @@
         <node concept="3clFbF" id="4n$QnzZKysZ" role="3cqZAp">
           <node concept="2YIFZM" id="4n$QnzZKytT" role="3clFbG">
             <ref role="1Pybhc" to="e2ly:~TreeUtil" resolve="TreeUtil" />
-            <ref role="37wK5l" to="e2ly:~TreeUtil.expandAll(javax.swing.JTree):void" resolve="expandAll" />
+            <ref role="37wK5l" to="e2ly:~TreeUtil.expandAll(javax.swing.JTree)" resolve="expandAll" />
             <node concept="2OqwBi" id="4n$QnzZNR6I" role="37wK5m">
               <node concept="37vLTw" id="4n$QnzZK_ww" role="2Oq$k0">
                 <ref role="3cqZAo" node="4n$QnzZKysI" resolve="myTreeTable" />
               </node>
               <node concept="liA8E" id="4n$QnzZNUQK" role="2OqNvi">
-                <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
               </node>
             </node>
           </node>
@@ -16457,7 +16457,7 @@
               <ref role="3cqZAo" node="4n$QnzZKysI" resolve="myTreeTable" />
             </node>
             <node concept="liA8E" id="4n$QnzZKytY" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Component.isShowing():boolean" resolve="isShowing" />
+              <ref role="37wK5l" to="z60i:~Component.isShowing()" resolve="isShowing" />
             </node>
           </node>
         </node>
@@ -16474,13 +16474,13 @@
         <node concept="3clFbF" id="4n$QnzZKyte" role="3cqZAp">
           <node concept="2YIFZM" id="4n$QnzZKyu1" role="3clFbG">
             <ref role="1Pybhc" to="e2ly:~TreeUtil" resolve="TreeUtil" />
-            <ref role="37wK5l" to="e2ly:~TreeUtil.collapseAll(javax.swing.JTree,int):void" resolve="collapseAll" />
+            <ref role="37wK5l" to="e2ly:~TreeUtil.collapseAll(javax.swing.JTree,int)" resolve="collapseAll" />
             <node concept="2OqwBi" id="4n$QnzZNXth" role="37wK5m">
               <node concept="37vLTw" id="4n$QnzZKAmM" role="2Oq$k0">
                 <ref role="3cqZAo" node="4n$QnzZKysI" resolve="myTreeTable" />
               </node>
               <node concept="liA8E" id="4n$QnzZO1dp" role="2OqNvi">
-                <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
               </node>
             </node>
             <node concept="3cmrfG" id="4n$QnzZKyth" role="37wK5m">
@@ -16516,11 +16516,11 @@
                   <ref role="3cqZAo" node="4n$QnzZKysI" resolve="myTreeTable" />
                 </node>
                 <node concept="liA8E" id="4n$QnzZO76Y" role="2OqNvi">
-                  <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                  <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
                 </node>
               </node>
               <node concept="liA8E" id="4n$QnzZKyu6" role="2OqNvi">
-                <ref role="37wK5l" to="dxuu:~JTree.getSelectionRows():int[]" resolve="getSelectionRows" />
+                <ref role="37wK5l" to="dxuu:~JTree.getSelectionRows()" resolve="getSelectionRows" />
               </node>
             </node>
           </node>
@@ -16549,13 +16549,13 @@
             <node concept="3clFbF" id="4n$QnzZKytB" role="3cqZAp">
               <node concept="2YIFZM" id="4n$QnzZKyue" role="3clFbG">
                 <ref role="1Pybhc" to="e2ly:~TreeUtil" resolve="TreeUtil" />
-                <ref role="37wK5l" to="e2ly:~TreeUtil.showRowCentered(javax.swing.JTree,int,boolean):com.intellij.openapi.util.ActionCallback" resolve="showRowCentered" />
+                <ref role="37wK5l" to="e2ly:~TreeUtil.showRowCentered(javax.swing.JTree,int,boolean)" resolve="showRowCentered" />
                 <node concept="2OqwBi" id="4n$QnzZO90g" role="37wK5m">
                   <node concept="37vLTw" id="4n$QnzZKB8e" role="2Oq$k0">
                     <ref role="3cqZAo" node="4n$QnzZKysI" resolve="myTreeTable" />
                   </node>
                   <node concept="liA8E" id="4n$QnzZOcLu" role="2OqNvi">
-                    <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                    <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
                   </node>
                 </node>
                 <node concept="AH0OO" id="4n$QnzZKytE" role="37wK5m">
@@ -16589,7 +16589,7 @@
               <ref role="3cqZAo" node="4n$QnzZKysI" resolve="myTreeTable" />
             </node>
             <node concept="liA8E" id="4n$QnzZKyuj" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Component.isShowing():boolean" resolve="isShowing" />
+              <ref role="37wK5l" to="z60i:~Component.isShowing()" resolve="isShowing" />
             </node>
           </node>
         </node>
@@ -16627,7 +16627,7 @@
       <node concept="3clFbS" id="3gJBs5s$cVQ" role="3clF47">
         <node concept="3clFbF" id="3gJBs5s$DhZ" role="3cqZAp">
           <node concept="2YIFZM" id="4peSo3D16mZ" role="3clFbG">
-            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+            <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
             <node concept="37vLTw" id="3gJBs5s$DhY" role="37wK5m">
               <ref role="3cqZAo" node="3gJBs5s$cVL" resolve="variable" />
@@ -16649,7 +16649,7 @@
         <ref role="3uigEE" to="ni5j:~Pattern" resolve="Pattern" />
       </node>
       <node concept="2YIFZM" id="6wS_caAMjaU" role="33vP2m">
-        <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String):java.util.regex.Pattern" resolve="compile" />
+        <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String)" resolve="compile" />
         <ref role="1Pybhc" to="ni5j:~Pattern" resolve="Pattern" />
         <node concept="Xl_RD" id="6wS_caAMjxm" role="37wK5m">
           <property role="Xl_RC" value="[a-z]?:?[-a-z0-9]+/.*~(.*)" />
@@ -16663,7 +16663,7 @@
         <ref role="3uigEE" to="ni5j:~Pattern" resolve="Pattern" />
       </node>
       <node concept="2YIFZM" id="6wS_caAOoNB" role="33vP2m">
-        <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String):java.util.regex.Pattern" resolve="compile" />
+        <ref role="37wK5l" to="ni5j:~Pattern.compile(java.lang.String)" resolve="compile" />
         <ref role="1Pybhc" to="ni5j:~Pattern" resolve="Pattern" />
         <node concept="Xl_RD" id="6wS_caAOoNC" role="37wK5m">
           <property role="Xl_RC" value="[a-z]?:?[-a-z0-9]+.*/([0-9]+)" />
@@ -16812,7 +16812,7 @@
               <ref role="3cqZAo" node="1G9MbtSGvMj" resolve="builder" />
             </node>
             <node concept="liA8E" id="1G9MbtSGvMw" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -16879,7 +16879,7 @@
               <ref role="3cqZAo" node="428_4iYAWUc" resolve="builder" />
             </node>
             <node concept="liA8E" id="428_4iYAWUr" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -16946,7 +16946,7 @@
               <ref role="3cqZAo" node="6kEuCh$O_vs" resolve="builder" />
             </node>
             <node concept="liA8E" id="6kEuCh$O_vE" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -17009,7 +17009,7 @@
               <ref role="3cqZAo" node="1G9MbtSGvMF" resolve="builder" />
             </node>
             <node concept="liA8E" id="1G9MbtSGvMR" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -17059,9 +17059,9 @@
                   <ref role="3cqZAo" node="1G9MbtSGvN0" resolve="sb" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSGvN8" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="2YIFZM" id="1G9MbtSGvN9" role="37wK5m">
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="37vLTw" id="1G9MbtSGvNa" role="37wK5m">
                       <ref role="3cqZAo" node="1G9MbtSGvMW" resolve="tf" />
@@ -17074,7 +17074,7 @@
           </node>
           <node concept="2OqwBi" id="1G9MbtSGvNc" role="3clFbw">
             <node concept="liA8E" id="1G9MbtSGvNd" role="2OqNvi">
-              <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind):boolean" resolve="is" />
+              <ref role="37wK5l" to="yt73:~Term.is(jetbrains.mps.unification.Term$Kind)" resolve="is" />
               <node concept="Rm8GO" id="1G9MbtSGvNe" role="37wK5m">
                 <ref role="1Px2BO" to="yt73:~Term$Kind" resolve="Term.Kind" />
                 <ref role="Rm8GQ" to="yt73:~Term$Kind.VAR" resolve="VAR" />
@@ -17201,7 +17201,7 @@
               <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
             </node>
             <node concept="liA8E" id="1G9MbtSGvNR" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
               <node concept="2ShNRf" id="1G9MbtSGvNS" role="37wK5m">
                 <node concept="1pGfFk" id="1G9MbtSGvNT" role="2ShVmc">
                   <ref role="37wK5l" node="1G9MbtSGvRK" resolve="TreeFormPrinter.Formatter" />
@@ -17282,7 +17282,7 @@
                     <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
                   </node>
                   <node concept="liA8E" id="1G9MbtSTQ6v" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                   </node>
                 </node>
                 <node concept="liA8E" id="1G9MbtSTQ6w" role="2OqNvi">
@@ -17297,7 +17297,7 @@
                 <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
               </node>
               <node concept="liA8E" id="1G9MbtSGvOm" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty():boolean" resolve="isEmpty" />
+                <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty()" resolve="isEmpty" />
               </node>
             </node>
           </node>
@@ -17309,7 +17309,7 @@
               <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
             </node>
             <node concept="liA8E" id="1G9MbtSGvOr" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
               <node concept="2ShNRf" id="1G9MbtSGvOs" role="37wK5m">
                 <node concept="1pGfFk" id="1G9MbtSGvOt" role="2ShVmc">
                   <ref role="37wK5l" node="1G9MbtSGvRK" resolve="TreeFormPrinter.Formatter" />
@@ -17327,7 +17327,7 @@
               <ref role="3cqZAo" node="1G9MbtSGvZs" resolve="endStack" />
             </node>
             <node concept="liA8E" id="1G9MbtSGvPy" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
               <node concept="Rm8GO" id="1G9MbtSGvPz" role="37wK5m">
                 <ref role="1Px2BO" node="1G9MbtSGvTG" resolve="TreeFormPrinter.EndWalk" />
                 <ref role="Rm8GQ" node="1G9MbtSGvTZ" resolve="END_NODE" />
@@ -17428,7 +17428,7 @@
                     <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
                   </node>
                   <node concept="liA8E" id="6YPNC4O3efT" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6YPNC4O3efU" role="2OqNvi">
@@ -17443,7 +17443,7 @@
                 <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
               </node>
               <node concept="liA8E" id="6YPNC4O3efY" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty():boolean" resolve="isEmpty" />
+                <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty()" resolve="isEmpty" />
               </node>
             </node>
           </node>
@@ -17456,14 +17456,14 @@
                 <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
               </node>
               <node concept="liA8E" id="6YPNC4O3eg4" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
               </node>
             </node>
             <node concept="liA8E" id="6YPNC4O3eg5" role="2OqNvi">
               <ref role="37wK5l" node="6wS_caAJSJV" resolve="formatRole" />
               <node concept="2YIFZM" id="6YPNC4O3eg6" role="37wK5m">
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <node concept="2OqwBi" id="6YPNC4O3eg7" role="37wK5m">
                   <node concept="37vLTw" id="6YPNC4PttJi" role="2Oq$k0">
                     <ref role="3cqZAo" node="6YPNC4PtfEt" resolve="roleNode" />
@@ -17482,7 +17482,7 @@
               <ref role="3cqZAo" node="1G9MbtSGvZs" resolve="endStack" />
             </node>
             <node concept="liA8E" id="6YPNC4O3egd" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
               <node concept="Rm8GO" id="6YPNC4O3ege" role="37wK5m">
                 <ref role="Rm8GQ" node="1G9MbtSMj0B" resolve="END_ROLE" />
                 <ref role="1Px2BO" node="1G9MbtSGvTG" resolve="TreeFormPrinter.EndWalk" />
@@ -17540,11 +17540,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="kTK1BfNewc" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                  <ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
                 </node>
               </node>
               <node concept="liA8E" id="kTK1BfNewd" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
               </node>
             </node>
           </node>
@@ -17554,7 +17554,7 @@
             <property role="TrG5h" value="name" />
             <node concept="17QB3L" id="1G9MbtSGvQd" role="1tU5fm" />
             <node concept="2YIFZM" id="1G9MbtSGvQe" role="33vP2m">
-              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
               <node concept="2OqwBi" id="1G9MbtSGvQf" role="37wK5m">
                 <node concept="37vLTw" id="1G9MbtSGvQg" role="2Oq$k0">
@@ -17582,7 +17582,7 @@
                     <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
                   </node>
                   <node concept="liA8E" id="1EFtv_BFSxk" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                   </node>
                 </node>
                 <node concept="liA8E" id="1EFtv_BFSTm" role="2OqNvi">
@@ -17600,7 +17600,7 @@
                     <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
                   </node>
                   <node concept="liA8E" id="1EFtv_BFTqw" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                   </node>
                 </node>
                 <node concept="liA8E" id="1EFtv_BFTqx" role="2OqNvi">
@@ -17615,7 +17615,7 @@
               <property role="Xl_RC" value="_term" />
             </node>
             <node concept="liA8E" id="1EFtv_BClsj" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
               <node concept="37vLTw" id="1EFtv_BClGO" role="37wK5m">
                 <ref role="3cqZAo" node="1G9MbtSGvQc" resolve="name" />
               </node>
@@ -17630,7 +17630,7 @@
                       <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
                     </node>
                     <node concept="liA8E" id="1G9MbtST5Zm" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                      <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                     </node>
                   </node>
                   <node concept="liA8E" id="1G9MbtST5Zn" role="2OqNvi">
@@ -17645,7 +17645,7 @@
                       <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
                     </node>
                     <node concept="liA8E" id="1G9MbtSGvQn" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                      <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                     </node>
                   </node>
                   <node concept="liA8E" id="1G9MbtSGvQo" role="2OqNvi">
@@ -17701,7 +17701,7 @@
                       <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
                     </node>
                     <node concept="liA8E" id="1G9MbtSUNNO" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                      <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
                     </node>
                   </node>
                   <node concept="liA8E" id="1G9MbtSUNNP" role="2OqNvi">
@@ -17716,7 +17716,7 @@
                   <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSUNNT" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty():boolean" resolve="isEmpty" />
+                  <ref role="37wK5l" to="33ny:~AbstractCollection.isEmpty()" resolve="isEmpty" />
                 </node>
               </node>
             </node>
@@ -17731,7 +17731,7 @@
                   <ref role="3cqZAo" node="1G9MbtSGvZz" resolve="stringBuilder" />
                 </node>
                 <node concept="liA8E" id="6X1kwjBMPPZ" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="Xl_RD" id="6X1kwjBMQq3" role="37wK5m">
                     <property role="Xl_RC" value="…" />
                   </node>
@@ -17757,7 +17757,7 @@
                     <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
                   </node>
                   <node concept="liA8E" id="1G9MbtSUQ4F" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
                     <node concept="2ShNRf" id="1G9MbtSUQ4G" role="37wK5m">
                       <node concept="1pGfFk" id="1G9MbtSUQ4H" role="2ShVmc">
                         <ref role="37wK5l" node="1G9MbtSGvRK" resolve="TreeFormPrinter.Formatter" />
@@ -17775,7 +17775,7 @@
                     <ref role="3cqZAo" node="1G9MbtSGvZs" resolve="endStack" />
                   </node>
                   <node concept="liA8E" id="1G9MbtSGvPO" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object):void" resolve="push" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
                     <node concept="Rm8GO" id="1G9MbtSGvPP" role="37wK5m">
                       <ref role="Rm8GQ" node="1G9MbtSGvTH" resolve="END_LIST" />
                       <ref role="1Px2BO" node="1G9MbtSGvTG" resolve="TreeFormPrinter.EndWalk" />
@@ -17826,7 +17826,7 @@
                 <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
               </node>
               <node concept="liA8E" id="428_4iYDtrB" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
               </node>
             </node>
             <node concept="liA8E" id="428_4iYDtrC" role="2OqNvi">
@@ -17842,21 +17842,21 @@
                   <ref role="3cqZAo" node="1G9MbtSGvZz" resolve="stringBuilder" />
                 </node>
                 <node concept="liA8E" id="428_4iYDtrG" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="Xl_RD" id="428_4iYDAit" role="37wK5m">
                     <property role="Xl_RC" value="»" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="428_4iYDxQV" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.Object):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.Object)" resolve="append" />
                 <node concept="37vLTw" id="428_4iYDz3f" role="37wK5m">
                   <ref role="3cqZAo" node="428_4iYDmbN" resolve="value" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="428_4iYD_DX" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
               <node concept="Xl_RD" id="428_4iYDvWE" role="37wK5m">
                 <property role="Xl_RC" value="«" />
               </node>
@@ -17896,7 +17896,7 @@
                 <ref role="3cqZAo" node="1G9MbtSGvZl" resolve="formatStack" />
               </node>
               <node concept="liA8E" id="1G9MbtSGvRb" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~LinkedList.peek():java.lang.Object" resolve="peek" />
+                <ref role="37wK5l" to="33ny:~LinkedList.peek()" resolve="peek" />
               </node>
             </node>
             <node concept="liA8E" id="1G9MbtSGvRc" role="2OqNvi">
@@ -17910,7 +17910,7 @@
               <ref role="3cqZAo" node="1G9MbtSGvZz" resolve="stringBuilder" />
             </node>
             <node concept="liA8E" id="1G9MbtSGvRg" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
               <node concept="2OqwBi" id="1G9MbtSGvRh" role="37wK5m">
                 <node concept="37vLTw" id="1G9MbtSGvRi" role="2Oq$k0">
                   <ref role="3cqZAo" node="1G9MbtSGvZA" resolve="variableSymbol" />
@@ -17947,7 +17947,7 @@
                 <ref role="3cqZAo" node="1G9MbtSGvZs" resolve="endStack" />
               </node>
               <node concept="liA8E" id="1G9MbtSGvRw" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
               </node>
             </node>
             <node concept="liA8E" id="1G9MbtSGvRx" role="2OqNvi">
@@ -18018,14 +18018,14 @@
                   <ref role="3cqZAo" node="1G9MbtSGvZz" resolve="stringBuilder" />
                 </node>
                 <node concept="liA8E" id="6wS_caAK3G3" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="37vLTw" id="6wS_caAK4cx" role="37wK5m">
                     <ref role="3cqZAo" node="6wS_caAJVWZ" resolve="name" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="6wS_caAK5QT" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="Xl_RD" id="6wS_caAK6ny" role="37wK5m">
                   <property role="Xl_RC" value=":" />
                 </node>
@@ -18051,7 +18051,7 @@
                 <ref role="3cqZAo" node="1G9MbtSGvZz" resolve="stringBuilder" />
               </node>
               <node concept="liA8E" id="1EFtv_BFQLe" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="1rXfSq" id="1EFtv_BFRwd" role="37wK5m">
                   <ref role="37wK5l" node="1EFtv_BCm1l" resolve="asString" />
                   <node concept="37vLTw" id="1EFtv_BFS1A" role="37wK5m">
@@ -18164,28 +18164,28 @@
                         <ref role="3cqZAo" node="1G9MbtSGvZz" resolve="stringBuilder" />
                       </node>
                       <node concept="liA8E" id="1EFtv_BCrMA" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                        <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                         <node concept="37vLTw" id="1EFtv_BCrMB" role="37wK5m">
                           <ref role="3cqZAo" node="1G9MbtSGvSt" resolve="name" />
                         </node>
                       </node>
                     </node>
                     <node concept="liA8E" id="1EFtv_BCrMC" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                       <node concept="Xl_RD" id="1EFtv_BCrMD" role="37wK5m">
                         <property role="Xl_RC" value="=" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="1EFtv_BCrME" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="Xl_RD" id="1EFtv_BCrMF" role="37wK5m">
                       <property role="Xl_RC" value="'" />
                     </node>
                   </node>
                 </node>
                 <node concept="liA8E" id="1EFtv_BCrMG" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="1rXfSq" id="1EFtv_BCsWJ" role="37wK5m">
                     <ref role="37wK5l" node="1EFtv_BCm1l" resolve="asString" />
                     <node concept="37vLTw" id="1EFtv_BCtt5" role="37wK5m">
@@ -18195,7 +18195,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1EFtv_BCrMI" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="Xl_RD" id="1EFtv_BCrMJ" role="37wK5m">
                   <property role="Xl_RC" value="'" />
                 </node>
@@ -18301,7 +18301,7 @@
                               <ref role="3cqZAo" node="1EFtv_BCm4U" resolve="value" />
                             </node>
                             <node concept="liA8E" id="1EFtv_BCmg0" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                             </node>
                           </node>
                         </node>
@@ -18317,7 +18317,7 @@
                               <ref role="3cqZAo" node="6wS_caAMdTZ" resolve="foreignReferencePattern" />
                             </node>
                             <node concept="liA8E" id="1EFtv_BCmg6" role="2OqNvi">
-                              <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence):java.util.regex.Matcher" resolve="matcher" />
+                              <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence)" resolve="matcher" />
                               <node concept="37vLTw" id="1EFtv_BCmg7" role="37wK5m">
                                 <ref role="3cqZAo" node="1EFtv_BCmfW" resolve="text" />
                               </node>
@@ -18336,7 +18336,7 @@
                               <ref role="3cqZAo" node="6wS_caAOoN$" resolve="domesticReferencePattern" />
                             </node>
                             <node concept="liA8E" id="1EFtv_BCmgd" role="2OqNvi">
-                              <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence):java.util.regex.Matcher" resolve="matcher" />
+                              <ref role="37wK5l" to="ni5j:~Pattern.matcher(java.lang.CharSequence)" resolve="matcher" />
                               <node concept="37vLTw" id="1EFtv_BCmge" role="37wK5m">
                                 <ref role="3cqZAo" node="1EFtv_BCmfW" resolve="text" />
                               </node>
@@ -18353,7 +18353,7 @@
                                   <ref role="3cqZAo" node="1EFtv_BCmg2" resolve="matcher1" />
                                 </node>
                                 <node concept="liA8E" id="1EFtv_BCmgl" role="2OqNvi">
-                                  <ref role="37wK5l" to="ni5j:~Matcher.group(int):java.lang.String" resolve="group" />
+                                  <ref role="37wK5l" to="ni5j:~Matcher.group(int)" resolve="group" />
                                   <node concept="3cmrfG" id="1EFtv_BCmgm" role="37wK5m">
                                     <property role="3cmrfH" value="1" />
                                   </node>
@@ -18371,7 +18371,7 @@
                             <ref role="3cqZAo" node="1EFtv_BCmg2" resolve="matcher1" />
                           </node>
                           <node concept="liA8E" id="1EFtv_BCmgr" role="2OqNvi">
-                            <ref role="37wK5l" to="ni5j:~Matcher.find():boolean" resolve="find" />
+                            <ref role="37wK5l" to="ni5j:~Matcher.find()" resolve="find" />
                           </node>
                         </node>
                         <node concept="3eNFk2" id="1EFtv_BCmgs" role="3eNLev">
@@ -18380,7 +18380,7 @@
                               <ref role="3cqZAo" node="1EFtv_BCmg9" resolve="matcher2" />
                             </node>
                             <node concept="liA8E" id="1EFtv_BCmgv" role="2OqNvi">
-                              <ref role="37wK5l" to="ni5j:~Matcher.find():boolean" resolve="find" />
+                              <ref role="37wK5l" to="ni5j:~Matcher.find()" resolve="find" />
                             </node>
                           </node>
                           <node concept="3clFbS" id="1EFtv_BCmgw" role="3eOfB_">
@@ -18391,7 +18391,7 @@
                                     <ref role="3cqZAo" node="1EFtv_BCmg9" resolve="matcher2" />
                                   </node>
                                   <node concept="liA8E" id="1EFtv_BCmg_" role="2OqNvi">
-                                    <ref role="37wK5l" to="ni5j:~Matcher.group(int):java.lang.String" resolve="group" />
+                                    <ref role="37wK5l" to="ni5j:~Matcher.group(int)" resolve="group" />
                                     <node concept="3cmrfG" id="1EFtv_BCmgA" role="37wK5m">
                                       <property role="3cmrfH" value="1" />
                                     </node>
@@ -18437,7 +18437,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="1EFtv_BCnvy" role="2OqNvi">
-                    <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+                    <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                   </node>
                 </node>
               </node>
@@ -18447,7 +18447,7 @@
               <node concept="3clFbS" id="1EFtv_BCquw" role="9aQI4">
                 <node concept="3cpWs6" id="1EFtv_BCr01" role="3cqZAp">
                   <node concept="2YIFZM" id="1EFtv_BCro7" role="3cqZAk">
-                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                    <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                     <node concept="37vLTw" id="1EFtv_BCrJw" role="37wK5m">
                       <ref role="3cqZAo" node="1EFtv_BCm4U" resolve="value" />
@@ -18474,7 +18474,7 @@
                     <ref role="3cqZAo" node="1G9MbtSGvZz" resolve="stringBuilder" />
                   </node>
                   <node concept="liA8E" id="1G9MbtSGvT3" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="AH0OO" id="1G9MbtSGvT4" role="37wK5m">
                       <node concept="37vLTw" id="1G9MbtT3ztM" role="AHEQo">
                         <ref role="3cqZAo" node="1G9MbtSGvTy" resolve="sepIdx" />
@@ -18522,7 +18522,7 @@
                     <ref role="3cqZAo" node="1G9MbtSGvZz" resolve="stringBuilder" />
                   </node>
                   <node concept="liA8E" id="6wS_caAT0eR" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="AH0OO" id="6wS_caAT0eS" role="37wK5m">
                       <node concept="37vLTw" id="6X1kwjBN8Lt" role="AHEQo">
                         <ref role="3cqZAo" node="6X1kwjBMYtz" resolve="OPEN" />
@@ -18550,7 +18550,7 @@
                 <ref role="3cqZAo" node="1G9MbtSGvZz" resolve="stringBuilder" />
               </node>
               <node concept="liA8E" id="1G9MbtSGvTn" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="AH0OO" id="1G9MbtSGvTo" role="37wK5m">
                   <node concept="37vLTw" id="6X1kwjBN870" role="AHEQo">
                     <ref role="3cqZAo" node="6X1kwjBN167" resolve="CLOSE" />
@@ -18615,7 +18615,7 @@
               <node concept="2OqwBi" id="1G9MbtSGvTR" role="3clFbG">
                 <node concept="2OqwBi" id="1G9MbtSGvTS" role="2Oq$k0">
                   <node concept="liA8E" id="1G9MbtSGvTT" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
                   </node>
                   <node concept="2OqwBi" id="1G9MbtSGvTU" role="2Oq$k0">
                     <node concept="37vLTw" id="1G9MbtSGvTV" role="2Oq$k0">
@@ -18650,7 +18650,7 @@
               <node concept="2OqwBi" id="1G9MbtSGvU5" role="3clFbG">
                 <node concept="2OqwBi" id="1G9MbtSGvU6" role="2Oq$k0">
                   <node concept="liA8E" id="1G9MbtSGvU7" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                    <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
                   </node>
                   <node concept="2OqwBi" id="1G9MbtSGvU8" role="2Oq$k0">
                     <node concept="37vLTw" id="1G9MbtSGvU9" role="2Oq$k0">
@@ -18694,7 +18694,7 @@
                 <node concept="2OqwBi" id="1G9MbtSMj0H" role="3clFbG">
                   <node concept="2OqwBi" id="1G9MbtSMj0I" role="2Oq$k0">
                     <node concept="liA8E" id="1G9MbtSMj0J" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~LinkedList.pop():java.lang.Object" resolve="pop" />
+                      <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
                     </node>
                     <node concept="2OqwBi" id="1G9MbtSMj0K" role="2Oq$k0">
                       <node concept="37vLTw" id="1G9MbtSMj0L" role="2Oq$k0">
@@ -19134,7 +19134,7 @@
               <ref role="3cqZAo" node="4n$QnzZCbce" resolve="toolbars" />
             </node>
             <node concept="liA8E" id="4n$QnzZCDA8" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object):void" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
               <node concept="2OqwBi" id="4n$QnzZDm4X" role="37wK5m">
                 <node concept="1rXfSq" id="4n$QnzZCFbP" role="2Oq$k0">
                   <ref role="37wK5l" node="4n$QnzZDmTN" resolve="createControlToolbar" />
@@ -19143,7 +19143,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4n$QnzZDmMC" role="2OqNvi">
-                  <ref role="37wK5l" to="qkt:~ActionToolbar.getComponent():javax.swing.JComponent" resolve="getComponent" />
+                  <ref role="37wK5l" to="qkt:~ActionToolbar.getComponent()" resolve="getComponent" />
                 </node>
               </node>
               <node concept="10M0yZ" id="4n$QnzZCEVe" role="37wK5m">
@@ -19159,7 +19159,7 @@
               <ref role="3cqZAo" node="4n$QnzZCbce" resolve="toolbars" />
             </node>
             <node concept="liA8E" id="4n$QnzZF8wd" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object):void" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
               <node concept="2OqwBi" id="4n$QnzZF8we" role="37wK5m">
                 <node concept="1rXfSq" id="4n$QnzZF8wf" role="2Oq$k0">
                   <ref role="37wK5l" node="Nob1E3_nQb" resolve="createFilterToolbar" />
@@ -19168,7 +19168,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="4n$QnzZF8wh" role="2OqNvi">
-                  <ref role="37wK5l" to="qkt:~ActionToolbar.getComponent():javax.swing.JComponent" resolve="getComponent" />
+                  <ref role="37wK5l" to="qkt:~ActionToolbar.getComponent()" resolve="getComponent" />
                 </node>
               </node>
               <node concept="10M0yZ" id="4n$QnzZF8wi" role="37wK5m">
@@ -19184,7 +19184,7 @@
               <ref role="3cqZAo" node="Nob1E3zyy0" resolve="tabPanel" />
             </node>
             <node concept="liA8E" id="Nob1E3zyyp" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object):void" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
               <node concept="37vLTw" id="4n$QnzZCsGH" role="37wK5m">
                 <ref role="3cqZAo" node="4n$QnzZCbce" resolve="toolbars" />
               </node>
@@ -19252,7 +19252,7 @@
               <ref role="3cqZAo" node="5TpjAH68oyV" resolve="splitter" />
             </node>
             <node concept="liA8E" id="5TpjAH68wl3" role="2OqNvi">
-              <ref role="37wK5l" to="jkm4:~Splitter.setFirstComponent(javax.swing.JComponent):void" resolve="setFirstComponent" />
+              <ref role="37wK5l" to="jkm4:~Splitter.setFirstComponent(javax.swing.JComponent)" resolve="setFirstComponent" />
               <node concept="37vLTw" id="JuOqj48dA8" role="37wK5m">
                 <ref role="3cqZAo" node="JuOqj43g5j" resolve="activationScrPane" />
               </node>
@@ -19265,7 +19265,7 @@
               <ref role="3cqZAo" node="5TpjAH68oyV" resolve="splitter" />
             </node>
             <node concept="liA8E" id="5TpjAH68OjM" role="2OqNvi">
-              <ref role="37wK5l" to="jkm4:~Splitter.setSecondComponent(javax.swing.JComponent):void" resolve="setSecondComponent" />
+              <ref role="37wK5l" to="jkm4:~Splitter.setSecondComponent(javax.swing.JComponent)" resolve="setSecondComponent" />
               <node concept="37vLTw" id="JuOqj48ocu" role="37wK5m">
                 <ref role="3cqZAo" node="JuOqj4472p" resolve="storeScrPane" />
               </node>
@@ -19279,7 +19279,7 @@
               <ref role="3cqZAo" node="Nob1E3zyy0" resolve="tabPanel" />
             </node>
             <node concept="liA8E" id="Nob1E3zyyC" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object):void" resolve="add" />
+              <ref role="37wK5l" to="z60i:~Container.add(java.awt.Component,java.lang.Object)" resolve="add" />
               <node concept="37vLTw" id="5TpjAH68Dqu" role="37wK5m">
                 <ref role="3cqZAo" node="5TpjAH68oyV" resolve="splitter" />
               </node>
@@ -19525,7 +19525,7 @@
               <ref role="3cqZAo" node="YGS68MPVLR" resolve="group" />
             </node>
             <node concept="liA8E" id="YGS68MPJ7V" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction):void" resolve="add" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="37vLTw" id="YGS68MPL$Y" role="37wK5m">
                 <ref role="3cqZAo" node="Nob1E3AwQ2" resolve="showTrying" />
               </node>
@@ -19538,7 +19538,7 @@
               <ref role="3cqZAo" node="YGS68MPVLR" resolve="group" />
             </node>
             <node concept="liA8E" id="YGS68MPJ8W" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction):void" resolve="add" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="37vLTw" id="YGS68MPOaJ" role="37wK5m">
                 <ref role="3cqZAo" node="2T1p0CFXHlL" resolve="showMatchDetails" />
               </node>
@@ -19551,7 +19551,7 @@
               <ref role="3cqZAo" node="YGS68MPVLR" resolve="group" />
             </node>
             <node concept="liA8E" id="YGS68MPLA8" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction):void" resolve="add" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="37vLTw" id="YGS68MPQQO" role="37wK5m">
                 <ref role="3cqZAo" node="Nob1E3AL$n" resolve="showOccurrenceEvents" />
               </node>
@@ -19564,7 +19564,7 @@
               <ref role="3cqZAo" node="YGS68MPVLR" resolve="group" />
             </node>
             <node concept="liA8E" id="YGS68MPObT" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction):void" resolve="add" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="37vLTw" id="YGS68MPTAf" role="37wK5m">
                 <ref role="3cqZAo" node="6_UQWSXisjK" resolve="showAskPredicateEvents" />
               </node>
@@ -19577,7 +19577,7 @@
               <ref role="3cqZAo" node="YGS68MPVLR" resolve="group" />
             </node>
             <node concept="liA8E" id="7vxJ_H4lVcG" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction):void" resolve="add" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="37vLTw" id="7vxJ_H4lXTg" role="37wK5m">
                 <ref role="3cqZAo" node="3mz2_dYAy5h" resolve="showTellPredicateEvents" />
               </node>
@@ -19590,7 +19590,7 @@
               <ref role="3cqZAo" node="YGS68MPVLR" resolve="group" />
             </node>
             <node concept="liA8E" id="YGS68MPQRY" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator():void" resolve="addSeparator" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator()" resolve="addSeparator" />
             </node>
           </node>
         </node>
@@ -19600,7 +19600,7 @@
               <ref role="3cqZAo" node="YGS68MPVLR" resolve="group" />
             </node>
             <node concept="liA8E" id="YGS68MPTC4" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction):void" resolve="add" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="37vLTw" id="YGS68MQsag" role="37wK5m">
                 <ref role="3cqZAo" node="YGS68MQcmy" resolve="showDiscarded" />
               </node>
@@ -19613,7 +19613,7 @@
               <ref role="3cqZAo" node="YGS68MPVLR" resolve="group" />
             </node>
             <node concept="liA8E" id="7vxJ_H4yhlc" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator():void" resolve="addSeparator" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator()" resolve="addSeparator" />
             </node>
           </node>
         </node>
@@ -19621,11 +19621,11 @@
         <node concept="3cpWs6" id="Nob1E3_nQ7" role="3cqZAp">
           <node concept="2OqwBi" id="Nob1E3_nQ1" role="3cqZAk">
             <node concept="2YIFZM" id="Nob1E3_nQ2" role="2Oq$k0">
-              <ref role="37wK5l" to="qkt:~ActionManager.getInstance():com.intellij.openapi.actionSystem.ActionManager" resolve="getInstance" />
+              <ref role="37wK5l" to="qkt:~ActionManager.getInstance()" resolve="getInstance" />
               <ref role="1Pybhc" to="qkt:~ActionManager" resolve="ActionManager" />
             </node>
             <node concept="liA8E" id="Nob1E3_nQ3" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~ActionManager.createActionToolbar(java.lang.String,com.intellij.openapi.actionSystem.ActionGroup,boolean):com.intellij.openapi.actionSystem.ActionToolbar" resolve="createActionToolbar" />
+              <ref role="37wK5l" to="qkt:~ActionManager.createActionToolbar(java.lang.String,com.intellij.openapi.actionSystem.ActionGroup,boolean)" resolve="createActionToolbar" />
               <node concept="10M0yZ" id="Nob1E3_nQ4" role="37wK5m">
                 <ref role="1PxDUh" to="qkt:~ActionPlaces" resolve="ActionPlaces" />
                 <ref role="3cqZAo" to="qkt:~ActionPlaces.UNKNOWN" resolve="UNKNOWN" />
@@ -19770,7 +19770,7 @@
                                       <ref role="3cqZAo" node="4n$QnzZDmV$" resolve="firstPath" />
                                     </node>
                                     <node concept="liA8E" id="4n$QnzZDmVL" role="2OqNvi">
-                                      <ref role="37wK5l" to="33ny:~List.toArray():java.lang.Object[]" resolve="toArray" />
+                                      <ref role="37wK5l" to="33ny:~List.toArray()" resolve="toArray" />
                                     </node>
                                   </node>
                                 </node>
@@ -19788,7 +19788,7 @@
                                   <ref role="3cqZAo" node="Nob1E3$O98" resolve="activationTreeTable" />
                                 </node>
                                 <node concept="liA8E" id="4n$QnzZDmVR" role="2OqNvi">
-                                  <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                                  <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
                                 </node>
                               </node>
                             </node>
@@ -19799,7 +19799,7 @@
                                 <ref role="3cqZAo" node="4n$QnzZDmVN" resolve="tree" />
                               </node>
                               <node concept="liA8E" id="4n$QnzZDmVV" role="2OqNvi">
-                                <ref role="37wK5l" to="dxuu:~JTree.makeVisible(javax.swing.tree.TreePath):void" resolve="makeVisible" />
+                                <ref role="37wK5l" to="dxuu:~JTree.makeVisible(javax.swing.tree.TreePath)" resolve="makeVisible" />
                                 <node concept="37vLTw" id="4n$QnzZDmVW" role="37wK5m">
                                   <ref role="3cqZAo" node="4n$QnzZDmVF" resolve="path" />
                                 </node>
@@ -19815,7 +19815,7 @@
                                   <ref role="3cqZAo" node="4n$QnzZDmVN" resolve="tree" />
                                 </node>
                                 <node concept="liA8E" id="4n$QnzZDmW2" role="2OqNvi">
-                                  <ref role="37wK5l" to="dxuu:~JTree.getRowForPath(javax.swing.tree.TreePath):int" resolve="getRowForPath" />
+                                  <ref role="37wK5l" to="dxuu:~JTree.getRowForPath(javax.swing.tree.TreePath)" resolve="getRowForPath" />
                                   <node concept="37vLTw" id="4n$QnzZDmW3" role="37wK5m">
                                     <ref role="3cqZAo" node="4n$QnzZDmVF" resolve="path" />
                                   </node>
@@ -19834,7 +19834,7 @@
                                   <ref role="3cqZAo" node="Nob1E3$O98" resolve="activationTreeTable" />
                                 </node>
                                 <node concept="liA8E" id="4n$QnzZDmW9" role="2OqNvi">
-                                  <ref role="37wK5l" to="dxuu:~JTable.getCellRect(int,int,boolean):java.awt.Rectangle" resolve="getCellRect" />
+                                  <ref role="37wK5l" to="dxuu:~JTable.getCellRect(int,int,boolean)" resolve="getCellRect" />
                                   <node concept="37vLTw" id="4n$QnzZDmWa" role="37wK5m">
                                     <ref role="3cqZAo" node="4n$QnzZDmVY" resolve="row" />
                                   </node>
@@ -19854,7 +19854,7 @@
                                 <ref role="3cqZAo" node="Nob1E3$O98" resolve="activationTreeTable" />
                               </node>
                               <node concept="liA8E" id="4n$QnzZDmWg" role="2OqNvi">
-                                <ref role="37wK5l" to="dxuu:~JComponent.scrollRectToVisible(java.awt.Rectangle):void" resolve="scrollRectToVisible" />
+                                <ref role="37wK5l" to="dxuu:~JComponent.scrollRectToVisible(java.awt.Rectangle)" resolve="scrollRectToVisible" />
                                 <node concept="37vLTw" id="4n$QnzZDmWh" role="37wK5m">
                                   <ref role="3cqZAo" node="4n$QnzZDmW5" resolve="rect" />
                                 </node>
@@ -19868,7 +19868,7 @@
                               <ref role="3cqZAo" node="4n$QnzZDmVp" resolve="failurePaths" />
                             </node>
                             <node concept="liA8E" id="4n$QnzZDmWl" role="2OqNvi">
-                              <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                              <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
                             </node>
                           </node>
                         </node>
@@ -19942,18 +19942,18 @@
                               <ref role="3cqZAo" node="4n$QnzZDmWr" resolve="event" />
                             </node>
                             <node concept="liA8E" id="4n$QnzZDmWL" role="2OqNvi">
-                              <ref role="37wK5l" to="qkt:~AnActionEvent.getPresentation():com.intellij.openapi.actionSystem.Presentation" resolve="getPresentation" />
+                              <ref role="37wK5l" to="qkt:~AnActionEvent.getPresentation()" resolve="getPresentation" />
                             </node>
                           </node>
                           <node concept="liA8E" id="4n$QnzZDmWM" role="2OqNvi">
-                            <ref role="37wK5l" to="qkt:~Presentation.setEnabled(boolean):void" resolve="setEnabled" />
+                            <ref role="37wK5l" to="qkt:~Presentation.setEnabled(boolean)" resolve="setEnabled" />
                             <node concept="3fqX7Q" id="4n$QnzZDmWN" role="37wK5m">
                               <node concept="2OqwBi" id="4n$QnzZDmWO" role="3fr31v">
                                 <node concept="37vLTw" id="4n$QnzZDmWP" role="2Oq$k0">
                                   <ref role="3cqZAo" node="4n$QnzZDmW_" resolve="failurePaths" />
                                 </node>
                                 <node concept="liA8E" id="4n$QnzZDmWQ" role="2OqNvi">
-                                  <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                                  <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
                                 </node>
                               </node>
                             </node>
@@ -19991,7 +19991,7 @@
               <ref role="3cqZAo" node="4n$QnzZDmWU" resolve="group" />
             </node>
             <node concept="liA8E" id="4n$QnzZDmXI" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction):void" resolve="add" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="37vLTw" id="4n$QnzZDmXJ" role="37wK5m">
                 <ref role="3cqZAo" node="4n$QnzZDmV3" resolve="goToError" />
               </node>
@@ -20004,14 +20004,14 @@
               <ref role="3cqZAo" node="4n$QnzZDmWU" resolve="group" />
             </node>
             <node concept="liA8E" id="4n$QnzZHlu3" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction):void" resolve="add" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="2OqwBi" id="4n$QnzZHnWj" role="37wK5m">
                 <node concept="2YIFZM" id="4n$QnzZHnQY" role="2Oq$k0">
-                  <ref role="37wK5l" to="ddhc:~CommonActionsManager.getInstance():com.intellij.ide.CommonActionsManager" resolve="getInstance" />
+                  <ref role="37wK5l" to="ddhc:~CommonActionsManager.getInstance()" resolve="getInstance" />
                   <ref role="1Pybhc" to="ddhc:~CommonActionsManager" resolve="CommonActionsManager" />
                 </node>
                 <node concept="liA8E" id="4n$QnzZHo5a" role="2OqNvi">
-                  <ref role="37wK5l" to="ddhc:~CommonActionsManager.createExpandAllAction(com.intellij.ide.TreeExpander,javax.swing.JComponent):com.intellij.openapi.actionSystem.AnAction" resolve="createExpandAllAction" />
+                  <ref role="37wK5l" to="ddhc:~CommonActionsManager.createExpandAllAction(com.intellij.ide.TreeExpander,javax.swing.JComponent)" resolve="createExpandAllAction" />
                   <node concept="2ShNRf" id="4n$QnzZHpSr" role="37wK5m">
                     <node concept="1pGfFk" id="4n$QnzZN3hE" role="2ShVmc">
                       <ref role="37wK5l" node="4n$QnzZKysM" resolve="TreeTableExpander" />
@@ -20034,14 +20034,14 @@
               <ref role="3cqZAo" node="4n$QnzZDmWU" resolve="group" />
             </node>
             <node concept="liA8E" id="4n$QnzZHyqc" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction):void" resolve="add" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="2OqwBi" id="4n$QnzZHyqd" role="37wK5m">
                 <node concept="2YIFZM" id="4n$QnzZHyqe" role="2Oq$k0">
-                  <ref role="37wK5l" to="ddhc:~CommonActionsManager.getInstance():com.intellij.ide.CommonActionsManager" resolve="getInstance" />
+                  <ref role="37wK5l" to="ddhc:~CommonActionsManager.getInstance()" resolve="getInstance" />
                   <ref role="1Pybhc" to="ddhc:~CommonActionsManager" resolve="CommonActionsManager" />
                 </node>
                 <node concept="liA8E" id="4n$QnzZHyqf" role="2OqNvi">
-                  <ref role="37wK5l" to="ddhc:~CommonActionsManager.createCollapseAllAction(com.intellij.ide.TreeExpander,javax.swing.JComponent):com.intellij.openapi.actionSystem.AnAction" resolve="createCollapseAllAction" />
+                  <ref role="37wK5l" to="ddhc:~CommonActionsManager.createCollapseAllAction(com.intellij.ide.TreeExpander,javax.swing.JComponent)" resolve="createCollapseAllAction" />
                   <node concept="2ShNRf" id="4n$QnzZHyqg" role="37wK5m">
                     <node concept="1pGfFk" id="4n$QnzZKMKi" role="2ShVmc">
                       <ref role="37wK5l" node="4n$QnzZKysM" resolve="TreeTableExpander" />
@@ -20064,7 +20064,7 @@
               <ref role="3cqZAo" node="4n$QnzZDmWU" resolve="group" />
             </node>
             <node concept="liA8E" id="4n$QnzZDmX1" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction):void" resolve="add" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.add(com.intellij.openapi.actionSystem.AnAction)" resolve="add" />
               <node concept="2ShNRf" id="4n$QnzZDmX2" role="37wK5m">
                 <node concept="1pGfFk" id="4n$QnzZDmX3" role="2ShVmc">
                   <ref role="37wK5l" to="71xd:~CloseAction.&lt;init&gt;(jetbrains.mps.ide.tools.BaseTool)" resolve="CloseAction" />
@@ -20082,7 +20082,7 @@
               <ref role="3cqZAo" node="4n$QnzZDmWU" resolve="group" />
             </node>
             <node concept="liA8E" id="4n$QnzZDmXx" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator():void" resolve="addSeparator" />
+              <ref role="37wK5l" to="qkt:~DefaultActionGroup.addSeparator()" resolve="addSeparator" />
             </node>
           </node>
         </node>
@@ -20090,11 +20090,11 @@
         <node concept="3cpWs6" id="4n$QnzZDmXL" role="3cqZAp">
           <node concept="2OqwBi" id="4n$QnzZDmXM" role="3cqZAk">
             <node concept="2YIFZM" id="4n$QnzZDmXN" role="2Oq$k0">
-              <ref role="37wK5l" to="qkt:~ActionManager.getInstance():com.intellij.openapi.actionSystem.ActionManager" resolve="getInstance" />
+              <ref role="37wK5l" to="qkt:~ActionManager.getInstance()" resolve="getInstance" />
               <ref role="1Pybhc" to="qkt:~ActionManager" resolve="ActionManager" />
             </node>
             <node concept="liA8E" id="4n$QnzZDmXO" role="2OqNvi">
-              <ref role="37wK5l" to="qkt:~ActionManager.createActionToolbar(java.lang.String,com.intellij.openapi.actionSystem.ActionGroup,boolean):com.intellij.openapi.actionSystem.ActionToolbar" resolve="createActionToolbar" />
+              <ref role="37wK5l" to="qkt:~ActionManager.createActionToolbar(java.lang.String,com.intellij.openapi.actionSystem.ActionGroup,boolean)" resolve="createActionToolbar" />
               <node concept="10M0yZ" id="4n$QnzZDmXP" role="37wK5m">
                 <ref role="1PxDUh" to="qkt:~ActionPlaces" resolve="ActionPlaces" />
                 <ref role="3cqZAo" to="qkt:~ActionPlaces.UNKNOWN" resolve="UNKNOWN" />
@@ -20147,7 +20147,7 @@
               <ref role="3cqZAo" node="6QkkSolpP4c" resolve="newTreeTable" />
             </node>
             <node concept="liA8E" id="5TpjAH69MJ5" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setAutoResizeMode(int):void" resolve="setAutoResizeMode" />
+              <ref role="37wK5l" to="dxuu:~JTable.setAutoResizeMode(int)" resolve="setAutoResizeMode" />
               <node concept="10M0yZ" id="5TpjAH69N_U" role="37wK5m">
                 <ref role="1PxDUh" to="dxuu:~JTable" resolve="JTable" />
                 <ref role="3cqZAo" to="dxuu:~JTable.AUTO_RESIZE_OFF" resolve="AUTO_RESIZE_OFF" />
@@ -20174,7 +20174,7 @@
               <ref role="3cqZAo" node="Nob1E3$O98" resolve="activationTreeTable" />
             </node>
             <node concept="liA8E" id="3WU9yfA6B8M" role="2OqNvi">
-              <ref role="37wK5l" to="u30n:~TreeTable.setRootVisible(boolean):void" resolve="setRootVisible" />
+              <ref role="37wK5l" to="u30n:~TreeTable.setRootVisible(boolean)" resolve="setRootVisible" />
               <node concept="3clFbT" id="3WU9yfA6B8N" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
@@ -20193,7 +20193,7 @@
                 <ref role="3cqZAo" node="Nob1E3$O98" resolve="activationTreeTable" />
               </node>
               <node concept="liA8E" id="3ZNrYIhI5IW" role="2OqNvi">
-                <ref role="37wK5l" to="dxuu:~JTable.getColumnModel():javax.swing.table.TableColumnModel" resolve="getColumnModel" />
+                <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
               </node>
             </node>
           </node>
@@ -20204,7 +20204,7 @@
             <node concept="10Oyi0" id="3ZNrYIhI5IZ" role="1tU5fm" />
             <node concept="2OqwBi" id="3ZNrYIhI5J0" role="33vP2m">
               <node concept="liA8E" id="3ZNrYIhI5J2" role="2OqNvi">
-                <ref role="37wK5l" to="u30n:~TreeTableModel.getColumnCount():int" resolve="getColumnCount" />
+                <ref role="37wK5l" to="u30n:~TreeTableModel.getColumnCount()" resolve="getColumnCount" />
               </node>
               <node concept="2OqwBi" id="6QkkSoloTP2" role="2Oq$k0">
                 <node concept="37vLTw" id="6QkkSoloTP3" role="2Oq$k0">
@@ -20252,7 +20252,7 @@
                     <ref role="3cqZAo" node="3ZNrYIhI5IS" resolve="columnModel" />
                   </node>
                   <node concept="liA8E" id="3ZNrYIhI5Ja" role="2OqNvi">
-                    <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int):javax.swing.table.TableColumn" resolve="getColumn" />
+                    <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
                     <node concept="37vLTw" id="3ZNrYIhI5Jb" role="37wK5m">
                       <ref role="3cqZAo" node="3ZNrYIhI5Jm" resolve="idx" />
                     </node>
@@ -20266,7 +20266,7 @@
                   <ref role="3cqZAo" node="3ZNrYIhI5J6" resolve="tc" />
                 </node>
                 <node concept="liA8E" id="3ZNrYIhI5Jf" role="2OqNvi">
-                  <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int):void" resolve="setPreferredWidth" />
+                  <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int)" resolve="setPreferredWidth" />
                   <node concept="3K4zz7" id="6kEuCh$UZ0T" role="37wK5m">
                     <node concept="AH0OO" id="6kEuCh$V0tr" role="3K4E3e">
                       <node concept="37vLTw" id="6kEuCh$V0Kp" role="AHEQo">
@@ -20404,7 +20404,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="3WU9yfA6B9o" role="2OqNvi">
-                                <ref role="37wK5l" to="g1qu:~ColumnInfo.valueOf(java.lang.Object):java.lang.Object" resolve="valueOf" />
+                                <ref role="37wK5l" to="g1qu:~ColumnInfo.valueOf(java.lang.Object)" resolve="valueOf" />
                                 <node concept="37vLTw" id="3WU9yfA6B9p" role="37wK5m">
                                   <ref role="3cqZAo" node="3WU9yfA6B91" resolve="value" />
                                 </node>
@@ -20457,11 +20457,11 @@
                 <ref role="3cqZAo" node="Nob1E3$O98" resolve="activationTreeTable" />
               </node>
               <node concept="liA8E" id="3WU9yfA6B9D" role="2OqNvi">
-                <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
               </node>
             </node>
             <node concept="liA8E" id="3WU9yfA6B9E" role="2OqNvi">
-              <ref role="37wK5l" to="u30n:~TreeTableTree.setCellRenderer(javax.swing.tree.TreeCellRenderer):void" resolve="setCellRenderer" />
+              <ref role="37wK5l" to="u30n:~TreeTableTree.setCellRenderer(javax.swing.tree.TreeCellRenderer)" resolve="setCellRenderer" />
               <node concept="37vLTw" id="3WU9yfA6B9F" role="37wK5m">
                 <ref role="3cqZAo" node="3WU9yfA6B8P" resolve="treeCellRenderer" />
               </node>
@@ -20501,7 +20501,7 @@
               <ref role="3cqZAo" node="Nob1E3$O98" resolve="activationTreeTable" />
             </node>
             <node concept="liA8E" id="3WU9yfA6B9O" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setDefaultRenderer(java.lang.Class,javax.swing.table.TableCellRenderer):void" resolve="setDefaultRenderer" />
+              <ref role="37wK5l" to="dxuu:~JTable.setDefaultRenderer(java.lang.Class,javax.swing.table.TableCellRenderer)" resolve="setDefaultRenderer" />
               <node concept="3VsKOn" id="3WU9yfA6B9P" role="37wK5m">
                 <ref role="3VsUkX" node="5pDu2jaXzDG" resolve="TableCellInfo" />
               </node>
@@ -20519,11 +20519,11 @@
                 <ref role="3cqZAo" node="Nob1E3$O98" resolve="activationTreeTable" />
               </node>
               <node concept="liA8E" id="6QkkSoliTFn" role="2OqNvi">
-                <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
               </node>
             </node>
             <node concept="liA8E" id="6QkkSoliXFs" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTree.addTreeSelectionListener(javax.swing.event.TreeSelectionListener):void" resolve="addTreeSelectionListener" />
+              <ref role="37wK5l" to="dxuu:~JTree.addTreeSelectionListener(javax.swing.event.TreeSelectionListener)" resolve="addTreeSelectionListener" />
               <node concept="2ShNRf" id="6QkkSoliY7s" role="37wK5m">
                 <node concept="YeOm9" id="6QkkSoliZzi" role="2ShVmc">
                   <node concept="1Y3b0j" id="6QkkSoliZzl" role="YeSDq">
@@ -20558,11 +20558,11 @@
                                   <ref role="3cqZAo" node="Nob1E3$O98" resolve="activationTreeTable" />
                                 </node>
                                 <node concept="liA8E" id="6QkkSolj2Kv" role="2OqNvi">
-                                  <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                                  <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="6QkkSolj2Kw" role="2OqNvi">
-                                <ref role="37wK5l" to="dxuu:~JTree.getSelectionPath():javax.swing.tree.TreePath" resolve="getSelectionPath" />
+                                <ref role="37wK5l" to="dxuu:~JTree.getSelectionPath()" resolve="getSelectionPath" />
                               </node>
                             </node>
                           </node>
@@ -20586,7 +20586,7 @@
                                       <ref role="3cqZAo" node="6QkkSolj2Kr" resolve="selectionPath" />
                                     </node>
                                     <node concept="liA8E" id="24qfZ7KlLwy" role="2OqNvi">
-                                      <ref role="37wK5l" to="rgfa:~TreePath.getLastPathComponent():java.lang.Object" resolve="getLastPathComponent" />
+                                      <ref role="37wK5l" to="rgfa:~TreePath.getLastPathComponent()" resolve="getLastPathComponent" />
                                     </node>
                                   </node>
                                 </node>
@@ -20642,7 +20642,7 @@
                                                       </node>
                                                     </node>
                                                     <node concept="liA8E" id="24qfZ7KmXoG" role="2OqNvi">
-                                                      <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
+                                                      <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments()" resolve="arguments" />
                                                     </node>
                                                   </node>
                                                   <node concept="A3Dl8" id="24qfZ7KmXoH" role="10QFUM">
@@ -20683,7 +20683,7 @@
                                                       </node>
                                                     </node>
                                                     <node concept="liA8E" id="24qfZ7KmXoW" role="2OqNvi">
-                                                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                                                      <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                                                     </node>
                                                   </node>
                                                   <node concept="A3Dl8" id="24qfZ7KmXoX" role="10QFUM">
@@ -20749,7 +20749,7 @@
                             </node>
                             <node concept="3clFbF" id="6QkkSolyUCp" role="3cqZAp">
                               <node concept="2YIFZM" id="6QkkSolyUFA" role="3clFbG">
-                                <ref role="37wK5l" to="dxuu:~SwingUtilities.invokeLater(java.lang.Runnable):void" resolve="invokeLater" />
+                                <ref role="37wK5l" to="dxuu:~SwingUtilities.invokeLater(java.lang.Runnable)" resolve="invokeLater" />
                                 <ref role="1Pybhc" to="dxuu:~SwingUtilities" resolve="SwingUtilities" />
                                 <node concept="1bVj0M" id="6QkkSolyVWS" role="37wK5m">
                                   <node concept="3clFbS" id="6QkkSolyVWT" role="1bW5cS">
@@ -20773,11 +20773,11 @@
                                                 <ref role="3cqZAo" node="6QkkSolbdUA" resolve="storeTreeTable" />
                                               </node>
                                               <node concept="liA8E" id="3sb6QlvitkL" role="2OqNvi">
-                                                <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                                                <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="3sb6Qlvi$G1" role="2OqNvi">
-                                              <ref role="37wK5l" to="dxuu:~JTree.makeVisible(javax.swing.tree.TreePath):void" resolve="makeVisible" />
+                                              <ref role="37wK5l" to="dxuu:~JTree.makeVisible(javax.swing.tree.TreePath)" resolve="makeVisible" />
                                               <node concept="2ShNRf" id="3sb6QlviBx0" role="37wK5m">
                                                 <node concept="1pGfFk" id="3sb6QlviBx1" role="2ShVmc">
                                                   <ref role="37wK5l" to="rgfa:~TreePath.&lt;init&gt;(java.lang.Object[])" resolve="TreePath" />
@@ -20786,7 +20786,7 @@
                                                       <ref role="3cqZAo" node="3sb6Qlvi9H9" resolve="p" />
                                                     </node>
                                                     <node concept="liA8E" id="3sb6QlviBx4" role="2OqNvi">
-                                                      <ref role="37wK5l" to="33ny:~List.toArray():java.lang.Object[]" resolve="toArray" />
+                                                      <ref role="37wK5l" to="33ny:~List.toArray()" resolve="toArray" />
                                                     </node>
                                                   </node>
                                                 </node>
@@ -20880,7 +20880,7 @@
               <ref role="3cqZAo" node="6QkkSolqGJf" resolve="newTreeTable" />
             </node>
             <node concept="liA8E" id="6QkkSolevYS" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setAutoResizeMode(int):void" resolve="setAutoResizeMode" />
+              <ref role="37wK5l" to="dxuu:~JTable.setAutoResizeMode(int)" resolve="setAutoResizeMode" />
               <node concept="10M0yZ" id="6QkkSolevYT" role="37wK5m">
                 <ref role="1PxDUh" to="dxuu:~JTable" resolve="JTable" />
                 <ref role="3cqZAo" to="dxuu:~JTable.AUTO_RESIZE_OFF" resolve="AUTO_RESIZE_OFF" />
@@ -20907,7 +20907,7 @@
               <ref role="3cqZAo" node="6QkkSolbdUA" resolve="storeTreeTable" />
             </node>
             <node concept="liA8E" id="6QkkSolevYX" role="2OqNvi">
-              <ref role="37wK5l" to="u30n:~TreeTable.setRootVisible(boolean):void" resolve="setRootVisible" />
+              <ref role="37wK5l" to="u30n:~TreeTable.setRootVisible(boolean)" resolve="setRootVisible" />
               <node concept="3clFbT" id="6QkkSolevYY" role="37wK5m">
                 <property role="3clFbU" value="false" />
               </node>
@@ -20926,7 +20926,7 @@
                 <ref role="3cqZAo" node="6QkkSolbdUA" resolve="storeTreeTable" />
               </node>
               <node concept="liA8E" id="6QkkSolevZ5" role="2OqNvi">
-                <ref role="37wK5l" to="dxuu:~JTable.getColumnModel():javax.swing.table.TableColumnModel" resolve="getColumnModel" />
+                <ref role="37wK5l" to="dxuu:~JTable.getColumnModel()" resolve="getColumnModel" />
               </node>
             </node>
           </node>
@@ -20937,7 +20937,7 @@
             <node concept="10Oyi0" id="6QkkSolevZ8" role="1tU5fm" />
             <node concept="2OqwBi" id="6QkkSolevZ9" role="33vP2m">
               <node concept="liA8E" id="6QkkSolevZb" role="2OqNvi">
-                <ref role="37wK5l" to="u30n:~TreeTableModel.getColumnCount():int" resolve="getColumnCount" />
+                <ref role="37wK5l" to="u30n:~TreeTableModel.getColumnCount()" resolve="getColumnCount" />
               </node>
               <node concept="2OqwBi" id="6QkkSolqxRT" role="2Oq$k0">
                 <node concept="37vLTw" id="6QkkSolqxRU" role="2Oq$k0">
@@ -20979,7 +20979,7 @@
                     <ref role="3cqZAo" node="6QkkSolevZ1" resolve="columnModel" />
                   </node>
                   <node concept="liA8E" id="6QkkSolevZj" role="2OqNvi">
-                    <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int):javax.swing.table.TableColumn" resolve="getColumn" />
+                    <ref role="37wK5l" to="c8ee:~TableColumnModel.getColumn(int)" resolve="getColumn" />
                     <node concept="37vLTw" id="6QkkSolevZk" role="37wK5m">
                       <ref role="3cqZAo" node="6QkkSolevZv" resolve="idx" />
                     </node>
@@ -20993,7 +20993,7 @@
                   <ref role="3cqZAo" node="6QkkSolevZf" resolve="tc" />
                 </node>
                 <node concept="liA8E" id="6kEuCh$WNeg" role="2OqNvi">
-                  <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int):void" resolve="setPreferredWidth" />
+                  <ref role="37wK5l" to="c8ee:~TableColumn.setPreferredWidth(int)" resolve="setPreferredWidth" />
                   <node concept="3K4zz7" id="6kEuCh$WNeh" role="37wK5m">
                     <node concept="AH0OO" id="6kEuCh$WNei" role="3K4E3e">
                       <node concept="37vLTw" id="6kEuCh$WNej" role="AHEQo">
@@ -21131,7 +21131,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="6QkkSoleZwS" role="2OqNvi">
-                                <ref role="37wK5l" to="g1qu:~ColumnInfo.valueOf(java.lang.Object):java.lang.Object" resolve="valueOf" />
+                                <ref role="37wK5l" to="g1qu:~ColumnInfo.valueOf(java.lang.Object)" resolve="valueOf" />
                                 <node concept="37vLTw" id="6QkkSoleZwT" role="37wK5m">
                                   <ref role="3cqZAo" node="6QkkSoleZwv" resolve="value" />
                                 </node>
@@ -21184,11 +21184,11 @@
                 <ref role="3cqZAo" node="6QkkSolbdUA" resolve="storeTreeTable" />
               </node>
               <node concept="liA8E" id="6QkkSoleZx9" role="2OqNvi">
-                <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
               </node>
             </node>
             <node concept="liA8E" id="6QkkSoleZxa" role="2OqNvi">
-              <ref role="37wK5l" to="u30n:~TreeTableTree.setCellRenderer(javax.swing.tree.TreeCellRenderer):void" resolve="setCellRenderer" />
+              <ref role="37wK5l" to="u30n:~TreeTableTree.setCellRenderer(javax.swing.tree.TreeCellRenderer)" resolve="setCellRenderer" />
               <node concept="37vLTw" id="6QkkSoleZxb" role="37wK5m">
                 <ref role="3cqZAo" node="6QkkSoleZwj" resolve="treeCellRenderer" />
               </node>
@@ -21228,7 +21228,7 @@
               <ref role="3cqZAo" node="6QkkSolbdUA" resolve="storeTreeTable" />
             </node>
             <node concept="liA8E" id="6QkkSoleZxq" role="2OqNvi">
-              <ref role="37wK5l" to="dxuu:~JTable.setDefaultRenderer(java.lang.Class,javax.swing.table.TableCellRenderer):void" resolve="setDefaultRenderer" />
+              <ref role="37wK5l" to="dxuu:~JTable.setDefaultRenderer(java.lang.Class,javax.swing.table.TableCellRenderer)" resolve="setDefaultRenderer" />
               <node concept="3VsKOn" id="6QkkSoleZxr" role="37wK5m">
                 <ref role="3VsUkX" node="5pDu2jaXzDG" resolve="TableCellInfo" />
               </node>
@@ -21347,7 +21347,7 @@
               <ref role="3cqZAo" node="Nob1E3$O98" resolve="activationTreeTable" />
             </node>
             <node concept="liA8E" id="6QkkSolnw3q" role="2OqNvi">
-              <ref role="37wK5l" to="u30n:~TreeTable.setModel(com.intellij.ui.treeStructure.treetable.TreeTableModel):void" resolve="setModel" />
+              <ref role="37wK5l" to="u30n:~TreeTable.setModel(com.intellij.ui.treeStructure.treetable.TreeTableModel)" resolve="setModel" />
               <node concept="2OqwBi" id="6QkkSolnw8w" role="37wK5m">
                 <node concept="37vLTw" id="YGS68MFWYV" role="2Oq$k0">
                   <ref role="3cqZAo" node="YGS68MFOdq" resolve="activationSink" />
@@ -21469,7 +21469,7 @@
               <ref role="3cqZAo" node="6QkkSolbdUA" resolve="storeTreeTable" />
             </node>
             <node concept="liA8E" id="6QkkSolrbhP" role="2OqNvi">
-              <ref role="37wK5l" to="u30n:~TreeTable.setModel(com.intellij.ui.treeStructure.treetable.TreeTableModel):void" resolve="setModel" />
+              <ref role="37wK5l" to="u30n:~TreeTable.setModel(com.intellij.ui.treeStructure.treetable.TreeTableModel)" resolve="setModel" />
               <node concept="2OqwBi" id="6QkkSolrbKv" role="37wK5m">
                 <node concept="37vLTw" id="YGS68MGU2k" role="2Oq$k0">
                   <ref role="3cqZAo" node="YGS68MGEqX" resolve="storeSink" />
@@ -21695,11 +21695,11 @@
                       <ref role="3cqZAo" node="6QkkSol9Cs8" resolve="treeTable" />
                     </node>
                     <node concept="liA8E" id="6QkkSol9E0_" role="2OqNvi">
-                      <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                      <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
                     </node>
                   </node>
                   <node concept="liA8E" id="6QkkSol9E0A" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~JTree.getModel():javax.swing.tree.TreeModel" resolve="getModel" />
+                    <ref role="37wK5l" to="dxuu:~JTree.getModel()" resolve="getModel" />
                   </node>
                 </node>
               </node>
@@ -21726,11 +21726,11 @@
                     <ref role="3cqZAo" node="6QkkSol9Cs8" resolve="treeTable" />
                   </node>
                   <node concept="liA8E" id="6QkkSol9Djl" role="2OqNvi">
-                    <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                    <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6QkkSol9Djm" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTree.getExpandedDescendants(javax.swing.tree.TreePath):java.util.Enumeration" resolve="getExpandedDescendants" />
+                  <ref role="37wK5l" to="dxuu:~JTree.getExpandedDescendants(javax.swing.tree.TreePath)" resolve="getExpandedDescendants" />
                   <node concept="2ShNRf" id="6QkkSol9Djn" role="37wK5m">
                     <node concept="1pGfFk" id="6QkkSol9Djo" role="2ShVmc">
                       <ref role="37wK5l" to="rgfa:~TreePath.&lt;init&gt;(java.lang.Object)" resolve="TreePath" />
@@ -21739,7 +21739,7 @@
                           <ref role="3cqZAo" node="6QkkSol9E0u" resolve="oldModel" />
                         </node>
                         <node concept="liA8E" id="6QkkSol9Djr" role="2OqNvi">
-                          <ref role="37wK5l" to="rgfa:~TreeModel.getRoot():java.lang.Object" resolve="getRoot" />
+                          <ref role="37wK5l" to="rgfa:~TreeModel.getRoot()" resolve="getRoot" />
                         </node>
                       </node>
                     </node>
@@ -21803,11 +21803,11 @@
                     <ref role="3cqZAo" node="6QkkSol9Cs8" resolve="treeTable" />
                   </node>
                   <node concept="liA8E" id="6QkkSol9DjW" role="2OqNvi">
-                    <ref role="37wK5l" to="u30n:~TreeTable.getTree():com.intellij.ui.treeStructure.treetable.TreeTableTree" resolve="getTree" />
+                    <ref role="37wK5l" to="u30n:~TreeTable.getTree()" resolve="getTree" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6QkkSol9DjX" role="2OqNvi">
-                  <ref role="37wK5l" to="dxuu:~JTree.getSelectionPaths():javax.swing.tree.TreePath[]" resolve="getSelectionPaths" />
+                  <ref role="37wK5l" to="dxuu:~JTree.getSelectionPaths()" resolve="getSelectionPaths" />
                 </node>
               </node>
             </node>
@@ -21847,7 +21847,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="6QkkSol9Dki" role="2OqNvi">
-                            <ref role="37wK5l" to="33ny:~Vector.elements():java.util.Enumeration" resolve="elements" />
+                            <ref role="37wK5l" to="33ny:~Vector.elements()" resolve="elements" />
                           </node>
                         </node>
                       </node>
@@ -23964,13 +23964,13 @@
                           <ref role="3cqZAo" node="6QkkSolKH$2" resolve="ref" />
                         </node>
                         <node concept="liA8E" id="6QkkSolKH$d" role="2OqNvi">
-                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                          <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                           <node concept="2OqwBi" id="6QkkSolKH$e" role="37wK5m">
                             <node concept="37vLTw" id="6QkkSolKH$f" role="2Oq$k0">
                               <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
                             </node>
                             <node concept="liA8E" id="6QkkSolKH$g" role="2OqNvi">
-                              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                             </node>
                           </node>
                         </node>
@@ -24010,11 +24010,11 @@
                               <ref role="3cqZAo" node="6QkkSolKH$9" resolve="snode" />
                             </node>
                             <node concept="liA8E" id="6QkkSolKH$r" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getConcept():org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getConcept()" resolve="getConcept" />
                             </node>
                           </node>
                           <node concept="liA8E" id="6QkkSolKH$s" role="2OqNvi">
-                            <ref role="37wK5l" to="c17a:~SAbstractConcept.getName():java.lang.String" resolve="getName" />
+                            <ref role="37wK5l" to="c17a:~SAbstractConcept.getName()" resolve="getName" />
                           </node>
                         </node>
                         <node concept="2ShNRf" id="6QkkSolKH$t" role="37wK5m">
@@ -24045,21 +24045,21 @@
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="6QkkSolKH$G" role="2OqNvi">
-                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean):jetbrains.mps.openapi.navigation.EditorNavigator" resolve="shallFocus" />
+                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
                                             <node concept="3clFbT" id="6QkkSolKH$H" role="37wK5m">
                                               <property role="3clFbU" value="false" />
                                             </node>
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="6QkkSolKH$I" role="2OqNvi">
-                                          <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean):jetbrains.mps.openapi.navigation.EditorNavigator" resolve="shallSelect" />
+                                          <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
                                           <node concept="3clFbT" id="6QkkSolKH$J" role="37wK5m">
                                             <property role="3clFbU" value="true" />
                                           </node>
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="6QkkSolKH$K" role="2OqNvi">
-                                        <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference):void" resolve="open" />
+                                        <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
                                         <node concept="37vLTw" id="6QkkSolKH$L" role="37wK5m">
                                           <ref role="3cqZAo" node="6QkkSolKH$2" resolve="ref" />
                                         </node>
@@ -24085,7 +24085,7 @@
                 <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
               </node>
               <node concept="liA8E" id="6QkkSolKH$P" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
               </node>
             </node>
           </node>
@@ -24217,13 +24217,13 @@
                         <ref role="3cqZAo" node="6QkkSolLVl2" resolve="ref" />
                       </node>
                       <node concept="liA8E" id="6QkkSolLVlc" role="2OqNvi">
-                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository):org.jetbrains.mps.openapi.model.SNode" resolve="resolve" />
+                        <ref role="37wK5l" to="mhbf:~SNodeReference.resolve(org.jetbrains.mps.openapi.module.SRepository)" resolve="resolve" />
                         <node concept="2OqwBi" id="6QkkSolLVld" role="37wK5m">
                           <node concept="37vLTw" id="6QkkSolLVle" role="2Oq$k0">
                             <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
                           </node>
                           <node concept="liA8E" id="6QkkSolLVlf" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -24243,7 +24243,7 @@
                             <ref role="3cqZAo" node="6QkkSolLVl8" resolve="snode" />
                           </node>
                           <node concept="liA8E" id="6QkkSolLVln" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getPresentation():java.lang.String" resolve="getPresentation" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getPresentation()" resolve="getPresentation" />
                           </node>
                         </node>
                       </node>
@@ -24262,7 +24262,7 @@
                               <ref role="3cqZAo" node="6QkkSolLVl8" resolve="snode" />
                             </node>
                             <node concept="liA8E" id="6QkkSolLVlw" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getName():java.lang.String" resolve="getName" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getName()" resolve="getName" />
                             </node>
                           </node>
                           <node concept="37vLTw" id="6QkkSolLVlx" role="3K4E3e">
@@ -24282,7 +24282,7 @@
                         </node>
                         <node concept="2YIFZM" id="6QkkSolLVlA" role="33vP2m">
                           <ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
-                          <ref role="37wK5l" to="18ew:~NameUtil.nodeFQName(org.jetbrains.mps.openapi.model.SNode):java.lang.String" resolve="nodeFQName" />
+                          <ref role="37wK5l" to="18ew:~NameUtil.nodeFQName(org.jetbrains.mps.openapi.model.SNode)" resolve="nodeFQName" />
                           <node concept="37vLTw" id="6QkkSolLVlB" role="37wK5m">
                             <ref role="3cqZAo" node="6QkkSolLVl8" resolve="snode" />
                           </node>
@@ -24337,21 +24337,21 @@
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="6QkkSolLVm0" role="2OqNvi">
-                                                <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean):jetbrains.mps.openapi.navigation.EditorNavigator" resolve="shallFocus" />
+                                                <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
                                                 <node concept="3clFbT" id="6QkkSolLVm1" role="37wK5m">
                                                   <property role="3clFbU" value="false" />
                                                 </node>
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="6QkkSolLVm2" role="2OqNvi">
-                                              <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean):jetbrains.mps.openapi.navigation.EditorNavigator" resolve="shallSelect" />
+                                              <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
                                               <node concept="3clFbT" id="6QkkSolLVm3" role="37wK5m">
                                                 <property role="3clFbU" value="true" />
                                               </node>
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="6QkkSolLVm4" role="2OqNvi">
-                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference):void" resolve="open" />
+                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
                                             <node concept="37vLTw" id="6QkkSolLVm5" role="37wK5m">
                                               <ref role="3cqZAo" node="6QkkSolLVl2" resolve="ref" />
                                             </node>
@@ -24414,7 +24414,7 @@
                 <ref role="3cqZAo" node="6QkkSolKz4F" resolve="mpsProject" />
               </node>
               <node concept="liA8E" id="6QkkSolLVmo" role="2OqNvi">
-                <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
               </node>
             </node>
           </node>
@@ -24556,11 +24556,11 @@
                         <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
                       </node>
                       <node concept="liA8E" id="7pxta7vkvEa" role="2OqNvi">
-                        <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                        <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                       </node>
                     </node>
                     <node concept="liA8E" id="7pxta7vkvEb" role="2OqNvi">
-                      <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                      <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                     </node>
                   </node>
                 </node>
@@ -24588,7 +24588,7 @@
                             <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
                           </node>
                           <node concept="liA8E" id="2rIdnPtwwEY" role="2OqNvi">
-                            <ref role="37wK5l" to="bj13:~Logical.isWildcard():boolean" resolve="isWildcard" />
+                            <ref role="37wK5l" to="bj13:~Logical.isWildcard()" resolve="isWildcard" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="2rIdnPtwwEZ" role="3K4GZi">
@@ -24596,7 +24596,7 @@
                             <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
                           </node>
                           <node concept="liA8E" id="2rIdnPtwwF1" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                           </node>
                         </node>
                       </node>
@@ -24726,7 +24726,7 @@
                                             <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
                                           </node>
                                           <node concept="liA8E" id="7pxta7vkse8" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                                           </node>
                                         </node>
                                         <node concept="Xl_RD" id="7pxta7vkse9" role="3uHU7w">
@@ -24782,21 +24782,21 @@
                                                   </node>
                                                 </node>
                                                 <node concept="liA8E" id="7pxta7vksew" role="2OqNvi">
-                                                  <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean):jetbrains.mps.openapi.navigation.EditorNavigator" resolve="shallFocus" />
+                                                  <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
                                                   <node concept="3clFbT" id="7pxta7vksex" role="37wK5m">
                                                     <property role="3clFbU" value="false" />
                                                   </node>
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="7pxta7vksey" role="2OqNvi">
-                                                <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean):jetbrains.mps.openapi.navigation.EditorNavigator" resolve="shallSelect" />
+                                                <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
                                                 <node concept="3clFbT" id="7pxta7vksez" role="37wK5m">
                                                   <property role="3clFbU" value="true" />
                                                 </node>
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="7pxta7vkse$" role="2OqNvi">
-                                              <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference):void" resolve="open" />
+                                              <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
                                               <node concept="37vLTw" id="7pxta7vkse_" role="37wK5m">
                                                 <ref role="3cqZAo" node="7pxta7vksdz" resolve="ref" />
                                               </node>
@@ -24883,7 +24883,7 @@
                                               <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
                                             </node>
                                             <node concept="liA8E" id="7pxta7vksf9" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                                              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                                             </node>
                                           </node>
                                           <node concept="Xl_RD" id="7pxta7vksfa" role="3uHU7w">
@@ -24960,11 +24960,11 @@
                                 <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
                               </node>
                               <node concept="liA8E" id="7pxta7vkv$h" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                                <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                               </node>
                             </node>
                             <node concept="liA8E" id="7pxta7vkv$i" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~Class.toString():java.lang.String" resolve="toString" />
+                              <ref role="37wK5l" to="wyt6:~Class.toString()" resolve="toString" />
                             </node>
                           </node>
                           <node concept="10Nm6u" id="7pxta7vkv$j" role="3K4GZi" />
@@ -25090,21 +25090,21 @@
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="3sb6Qlve17t" role="2OqNvi">
-                                              <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean):jetbrains.mps.openapi.navigation.EditorNavigator" resolve="shallFocus" />
+                                              <ref role="37wK5l" to="kz9k:~EditorNavigator.shallFocus(boolean)" resolve="shallFocus" />
                                               <node concept="3clFbT" id="3sb6Qlve17u" role="37wK5m">
                                                 <property role="3clFbU" value="false" />
                                               </node>
                                             </node>
                                           </node>
                                           <node concept="liA8E" id="3sb6Qlve17v" role="2OqNvi">
-                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean):jetbrains.mps.openapi.navigation.EditorNavigator" resolve="shallSelect" />
+                                            <ref role="37wK5l" to="kz9k:~EditorNavigator.shallSelect(boolean)" resolve="shallSelect" />
                                             <node concept="3clFbT" id="3sb6Qlve17w" role="37wK5m">
                                               <property role="3clFbU" value="true" />
                                             </node>
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="3sb6Qlve17x" role="2OqNvi">
-                                          <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference):void" resolve="open" />
+                                          <ref role="37wK5l" to="kz9k:~EditorNavigator.open(org.jetbrains.mps.openapi.model.SNodeReference)" resolve="open" />
                                           <node concept="37vLTw" id="3sb6Qlve17y" role="37wK5m">
                                             <ref role="3cqZAo" node="3sb6Qlve16U" resolve="ref" />
                                           </node>
@@ -25289,11 +25289,11 @@
                             <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
                           </node>
                           <node concept="liA8E" id="3sb6Qlve18x" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                            <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                           </node>
                         </node>
                         <node concept="liA8E" id="3sb6Qlve18y" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Class.toString():java.lang.String" resolve="toString" />
+                          <ref role="37wK5l" to="wyt6:~Class.toString()" resolve="toString" />
                         </node>
                       </node>
                       <node concept="10Nm6u" id="3sb6Qlve18z" role="3K4GZi" />
@@ -25562,7 +25562,7 @@
                       <ref role="3cqZAo" node="2tI9bOlayJK" resolve="value" />
                     </node>
                     <node concept="liA8E" id="2tI9bOlaYts" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                     </node>
                   </node>
                 </node>
@@ -26606,7 +26606,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="6RFuZEC71Wp" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
                   </node>
                 </node>
               </node>
@@ -26756,7 +26756,7 @@
                     <property role="TrG5h" value="text" />
                     <node concept="17QB3L" id="2T1p0CFJjh6" role="1tU5fm" />
                     <node concept="2YIFZM" id="2T1p0CFJjh7" role="33vP2m">
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                       <node concept="37vLTw" id="2T1p0CFJjh8" role="37wK5m">
                         <ref role="3cqZAo" node="4VwaB4LlwwF" resolve="treeNode" />
@@ -27007,7 +27007,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="2T1p0CFILb7" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
                   </node>
                 </node>
               </node>
@@ -27259,7 +27259,7 @@
                 <ref role="3cqZAo" node="2T1p0CFIMZM" resolve="sb" />
               </node>
               <node concept="liA8E" id="2T1p0CFIMZT" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="Xl_RD" id="2T1p0CFIMZU" role="37wK5m">
                   <property role="Xl_RC" value="match (" />
                 </node>
@@ -27286,7 +27286,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="2T1p0CFIN07" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
+                        <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadKept()" resolve="matchHeadKept" />
                       </node>
                     </node>
                   </node>
@@ -27315,7 +27315,7 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="2T1p0CFIN0l" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
+                        <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadReplaced()" resolve="matchHeadReplaced" />
                       </node>
                     </node>
                   </node>
@@ -27332,7 +27332,7 @@
                     <ref role="3cqZAo" node="2T1p0CFIMZM" resolve="sb" />
                   </node>
                   <node concept="liA8E" id="2T1p0CFIN0s" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(int):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(int)" resolve="append" />
                     <node concept="37vLTw" id="2T1p0CFIN0t" role="37wK5m">
                       <ref role="3cqZAo" node="2T1p0CFIMZW" resolve="keptSize" />
                     </node>
@@ -27358,14 +27358,14 @@
                       <ref role="3cqZAo" node="2T1p0CFIMZM" resolve="sb" />
                     </node>
                     <node concept="liA8E" id="2T1p0CFIN0B" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                       <node concept="Xl_RD" id="2T1p0CFIN0C" role="37wK5m">
                         <property role="Xl_RC" value="\\" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="2T1p0CFIN0D" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(int):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(int)" resolve="append" />
                     <node concept="37vLTw" id="2T1p0CFIN0E" role="37wK5m">
                       <ref role="3cqZAo" node="2T1p0CFIN0a" resolve="replSize" />
                     </node>
@@ -27388,7 +27388,7 @@
                 <ref role="3cqZAo" node="2T1p0CFIMZM" resolve="sb" />
               </node>
               <node concept="liA8E" id="2T1p0CFIN0L" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                 <node concept="Xl_RD" id="2T1p0CFIN0M" role="37wK5m">
                   <property role="Xl_RC" value=")" />
                 </node>
@@ -27404,7 +27404,7 @@
                     <ref role="3cqZAo" node="2T1p0CFIMZM" resolve="sb" />
                   </node>
                   <node concept="liA8E" id="2T1p0CFIN0S" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
                   </node>
                 </node>
                 <node concept="10Nm6u" id="2T1p0CFIN0T" role="37wK5m" />
@@ -27460,7 +27460,7 @@
               <property role="TrG5h" value="text" />
               <node concept="17QB3L" id="7vxJ_H4nj6P" role="1tU5fm" />
               <node concept="2YIFZM" id="7vxJ_H4nj6Q" role="33vP2m">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                 <node concept="1LFfDK" id="7vxJ_H4noc2" role="37wK5m">
                   <node concept="3cmrfG" id="7vxJ_H4norZ" role="1LF_Uc">
@@ -27519,7 +27519,7 @@
               <node concept="17QB3L" id="2T1p0CFIWe5" role="1tU5fm" />
               <node concept="2YIFZM" id="2T1p0CFIWe6" role="33vP2m">
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                 <node concept="37vLTw" id="2T1p0CFIXku" role="37wK5m">
                   <ref role="3cqZAo" node="2T1p0CFIVxQ" resolve="node" />
                 </node>
@@ -27642,11 +27642,11 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="4VwaB4LFs1z" role="2OqNvi">
-                        <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
+                        <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint()" resolve="constraint" />
                       </node>
                     </node>
                     <node concept="liA8E" id="4VwaB4LFs1$" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                      <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                     </node>
                   </node>
                 </node>
@@ -27657,7 +27657,7 @@
                     <ref role="3cqZAo" node="4VwaB4LFs1s" resolve="symbol" />
                   </node>
                   <node concept="liA8E" id="4VwaB4LFuRZ" role="2OqNvi">
-                    <ref role="37wK5l" to="av0y:~ConstraintSymbol.toString():java.lang.String" resolve="toString" />
+                    <ref role="37wK5l" to="av0y:~ConstraintSymbol.toString()" resolve="toString" />
                   </node>
                 </node>
               </node>
@@ -27714,15 +27714,15 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="6_UQWSXes_F" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate():jetbrains.mps.logic.reactor.program.Predicate" resolve="predicate" />
+                          <ref role="37wK5l" to="w7la:~PredicateInvocation.predicate()" resolve="predicate" />
                         </node>
                       </node>
                       <node concept="liA8E" id="6_UQWSXetab" role="2OqNvi">
-                        <ref role="37wK5l" to="av0y:~Predicate.symbol():jetbrains.mps.logic.reactor.program.PredicateSymbol" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Predicate.symbol()" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="6_UQWSXeqAv" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~PredicateSymbol.toString():java.lang.String" resolve="toString" />
+                      <ref role="37wK5l" to="av0y:~PredicateSymbol.toString()" resolve="toString" />
                     </node>
                   </node>
                 </node>
@@ -27781,15 +27781,15 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="6_UQWSXemqx" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint():jetbrains.mps.logic.reactor.program.Constraint" resolve="constraint" />
+                          <ref role="37wK5l" to="w7la:~ConstraintOccurrence.constraint()" resolve="constraint" />
                         </node>
                       </node>
                       <node concept="liA8E" id="6_UQWSXemqy" role="2OqNvi">
-                        <ref role="37wK5l" to="av0y:~Constraint.symbol():jetbrains.mps.logic.reactor.program.ConstraintSymbol" resolve="symbol" />
+                        <ref role="37wK5l" to="av0y:~Constraint.symbol()" resolve="symbol" />
                       </node>
                     </node>
                     <node concept="liA8E" id="6_UQWSXemqz" role="2OqNvi">
-                      <ref role="37wK5l" to="av0y:~ConstraintSymbol.toString():java.lang.String" resolve="toString" />
+                      <ref role="37wK5l" to="av0y:~ConstraintSymbol.toString()" resolve="toString" />
                     </node>
                   </node>
                 </node>
@@ -28005,7 +28005,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="5TpjAH61iLd" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="A3Dl8" id="5TpjAH61iLe" role="10QFUM">
@@ -28097,7 +28097,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="5TpjAH61n0w" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~PredicateInvocation.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="A3Dl8" id="5TpjAH61n0x" role="10QFUM">
@@ -28215,7 +28215,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="5TpjAH61t3x" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments():java.util.List" resolve="arguments" />
+                    <ref role="37wK5l" to="w7la:~ConstraintOccurrence.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="A3Dl8" id="5TpjAH61t3y" role="10QFUM">
@@ -28526,7 +28526,7 @@
                           <ref role="3cqZAo" node="YGS68MDFvN" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="YGS68MDFw6" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -28811,7 +28811,7 @@
                           <ref role="3cqZAo" node="32fHqDfcLw8" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="32fHqDfcR9$" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -28901,7 +28901,7 @@
                           <ref role="3cqZAo" node="YGS68MDFwX" resolve="matchRule" />
                         </node>
                         <node concept="liA8E" id="YGS68MDFxg" role="2OqNvi">
-                          <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                          <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
                         </node>
                       </node>
                     </node>
@@ -30035,7 +30035,7 @@
                 <ref role="3cqZAo" node="YGS68MJoYo" resolve="parentNode" />
               </node>
               <node concept="liA8E" id="YGS68MJoYP" role="2OqNvi">
-                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode):void" resolve="add" />
+                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode)" resolve="add" />
                 <node concept="37vLTw" id="YGS68MJoYQ" role="37wK5m">
                   <ref role="3cqZAo" node="YGS68MJoYv" resolve="matchNode" />
                 </node>
@@ -30139,7 +30139,7 @@
                 <ref role="3cqZAo" node="YGS68MJoZ6" resolve="matchNode" />
               </node>
               <node concept="liA8E" id="YGS68MJoZx" role="2OqNvi">
-                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode):void" resolve="add" />
+                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode)" resolve="add" />
                 <node concept="37vLTw" id="YGS68MJoZy" role="37wK5m">
                   <ref role="3cqZAo" node="YGS68MJoZd" resolve="groupNode" />
                 </node>
@@ -30166,7 +30166,7 @@
                     <ref role="3cqZAo" node="YGS68MJoZ2" resolve="matchRule" />
                   </node>
                   <node concept="liA8E" id="YGS68MJoZH" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadKept():java.lang.Iterable" resolve="matchHeadKept" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadKept()" resolve="matchHeadKept" />
                   </node>
                 </node>
               </node>
@@ -30204,7 +30204,7 @@
                     <ref role="3cqZAo" node="YGS68MJoZd" resolve="groupNode" />
                   </node>
                   <node concept="liA8E" id="YGS68MJoZW" role="2OqNvi">
-                    <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode):void" resolve="add" />
+                    <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode)" resolve="add" />
                     <node concept="37vLTw" id="YGS68MJoZX" role="37wK5m">
                       <ref role="3cqZAo" node="YGS68MJoZL" resolve="headNode" />
                     </node>
@@ -30242,7 +30242,7 @@
                     <ref role="3cqZAo" node="YGS68MJoZ2" resolve="matchRule" />
                   </node>
                   <node concept="liA8E" id="YGS68MJp0b" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadReplaced():java.lang.Iterable" resolve="matchHeadReplaced" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.matchHeadReplaced()" resolve="matchHeadReplaced" />
                   </node>
                 </node>
               </node>
@@ -30280,7 +30280,7 @@
                     <ref role="3cqZAo" node="YGS68MJoZd" resolve="groupNode" />
                   </node>
                   <node concept="liA8E" id="YGS68MJp0q" role="2OqNvi">
-                    <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode):void" resolve="add" />
+                    <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode)" resolve="add" />
                     <node concept="37vLTw" id="YGS68MJp0r" role="37wK5m">
                       <ref role="3cqZAo" node="YGS68MJp0f" resolve="headNode" />
                     </node>
@@ -30389,11 +30389,11 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="YGS68MJp1a" role="2OqNvi">
-                    <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                    <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
                   </node>
                 </node>
                 <node concept="liA8E" id="YGS68MJp1b" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                   <node concept="37vLTw" id="YGS68MJp1c" role="37wK5m">
                     <ref role="3cqZAo" node="YGS68MJp0z" resolve="rule" />
                   </node>
@@ -30481,11 +30481,11 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="32fHqDfdi_M" role="2OqNvi">
-                      <ref role="37wK5l" to="w7la:~RuleMatch.rule():jetbrains.mps.logic.reactor.program.Rule" resolve="rule" />
+                      <ref role="37wK5l" to="w7la:~RuleMatch.rule()" resolve="rule" />
                     </node>
                   </node>
                   <node concept="liA8E" id="32fHqDfdi_N" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                    <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                     <node concept="37vLTw" id="32fHqDfdi_O" role="37wK5m">
                       <ref role="3cqZAo" node="32fHqDfcRiB" resolve="rule" />
                     </node>
@@ -30604,7 +30604,7 @@
                 <ref role="3cqZAo" node="YGS68MJp1p" resolve="tip" />
               </node>
               <node concept="liA8E" id="YGS68MJp1P" role="2OqNvi">
-                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode):void" resolve="add" />
+                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode)" resolve="add" />
                 <node concept="37vLTw" id="YGS68MJp1Q" role="37wK5m">
                   <ref role="3cqZAo" node="YGS68MJp1w" resolve="occNode" />
                 </node>
@@ -30703,7 +30703,7 @@
                 <ref role="3cqZAo" node="YGS68MJp23" resolve="tip" />
               </node>
               <node concept="liA8E" id="YGS68MJp2v" role="2OqNvi">
-                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode):void" resolve="add" />
+                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode)" resolve="add" />
                 <node concept="37vLTw" id="YGS68MJp2w" role="37wK5m">
                   <ref role="3cqZAo" node="YGS68MJp2a" resolve="invokeNode" />
                 </node>
@@ -30820,7 +30820,7 @@
                 <ref role="3cqZAo" node="7vxJ_H4mqbx" resolve="tip" />
               </node>
               <node concept="liA8E" id="7vxJ_H4mqbX" role="2OqNvi">
-                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode):void" resolve="add" />
+                <ref role="37wK5l" to="rgfa:~DefaultMutableTreeNode.add(javax.swing.tree.MutableTreeNode)" resolve="add" />
                 <node concept="37vLTw" id="7vxJ_H4mqbY" role="37wK5m">
                   <ref role="3cqZAo" node="7vxJ_H4mqbC" resolve="failureNode" />
                 </node>
@@ -31093,7 +31093,7 @@
         <ref role="3uigEE" to="z60i:~Font" resolve="Font" />
       </node>
       <node concept="2YIFZM" id="_04VjSDB5Y" role="33vP2m">
-        <ref role="37wK5l" to="g1qu:~UIUtil.getButtonFont():java.awt.Font" resolve="getButtonFont" />
+        <ref role="37wK5l" to="g1qu:~UIUtil.getButtonFont()" resolve="getButtonFont" />
         <ref role="1Pybhc" to="g1qu:~UIUtil" resolve="UIUtil" />
       </node>
       <node concept="3Tm6S6" id="3WU9yfA8$dS" role="1B3o_S" />
@@ -31222,7 +31222,7 @@
                 <ref role="3cqZAo" node="3WU9yfA8xE1" resolve="font" />
               </node>
               <node concept="liA8E" id="3WU9yfA8xG7" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~Font.getStringBounds(java.lang.String,java.awt.font.FontRenderContext):java.awt.geom.Rectangle2D" resolve="getStringBounds" />
+                <ref role="37wK5l" to="z60i:~Font.getStringBounds(java.lang.String,java.awt.font.FontRenderContext)" resolve="getStringBounds" />
                 <node concept="37vLTw" id="3WU9yfA8xES" role="37wK5m">
                   <ref role="3cqZAo" node="3WU9yfA8xEE" resolve="iconText" />
                 </node>
@@ -31244,7 +31244,7 @@
                   <ref role="3cqZAo" node="3WU9yfA8xEO" resolve="bounds" />
                 </node>
                 <node concept="liA8E" id="3WU9yfA8xGc" role="2OqNvi">
-                  <ref role="37wK5l" to="fbzs:~RectangularShape.getWidth():double" resolve="getWidth" />
+                  <ref role="37wK5l" to="fbzs:~RectangularShape.getWidth()" resolve="getWidth" />
                 </node>
               </node>
               <node concept="10Oyi0" id="3WU9yfA8xEZ" role="10QFUM" />
@@ -31262,7 +31262,7 @@
                   <ref role="3cqZAo" node="3WU9yfA8xEO" resolve="bounds" />
                 </node>
                 <node concept="liA8E" id="3WU9yfA8xGh" role="2OqNvi">
-                  <ref role="37wK5l" to="fbzs:~RectangularShape.getHeight():double" resolve="getHeight" />
+                  <ref role="37wK5l" to="fbzs:~RectangularShape.getHeight()" resolve="getHeight" />
                 </node>
               </node>
               <node concept="10Oyi0" id="3WU9yfA8xF5" role="10QFUM" />
@@ -31365,7 +31365,7 @@
               <ref role="3cqZAo" node="3WU9yfA8xFx" resolve="g2d" />
             </node>
             <node concept="liA8E" id="3WU9yfA8xGm" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics.setFont(java.awt.Font):void" resolve="setFont" />
+              <ref role="37wK5l" to="z60i:~Graphics.setFont(java.awt.Font)" resolve="setFont" />
               <node concept="37vLTw" id="3WU9yfA8xFD" role="37wK5m">
                 <ref role="3cqZAo" node="3WU9yfA8xE1" resolve="font" />
               </node>
@@ -31378,7 +31378,7 @@
               <ref role="3cqZAo" node="3WU9yfA8xFx" resolve="g2d" />
             </node>
             <node concept="liA8E" id="3WU9yfA8xGr" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics2D.setRenderingHint(java.awt.RenderingHints$Key,java.lang.Object):void" resolve="setRenderingHint" />
+              <ref role="37wK5l" to="z60i:~Graphics2D.setRenderingHint(java.awt.RenderingHints$Key,java.lang.Object)" resolve="setRenderingHint" />
               <node concept="10M0yZ" id="3WU9yfA8yql" role="37wK5m">
                 <ref role="1PxDUh" to="z60i:~RenderingHints" resolve="RenderingHints" />
                 <ref role="3cqZAo" to="z60i:~RenderingHints.KEY_TEXT_ANTIALIASING" resolve="KEY_TEXT_ANTIALIASING" />
@@ -31396,7 +31396,7 @@
               <ref role="3cqZAo" node="3WU9yfA8xFx" resolve="g2d" />
             </node>
             <node concept="liA8E" id="3WU9yfA8xGA" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics2D.setRenderingHint(java.awt.RenderingHints$Key,java.lang.Object):void" resolve="setRenderingHint" />
+              <ref role="37wK5l" to="z60i:~Graphics2D.setRenderingHint(java.awt.RenderingHints$Key,java.lang.Object)" resolve="setRenderingHint" />
               <node concept="10M0yZ" id="3WU9yfA8yqn" role="37wK5m">
                 <ref role="1PxDUh" to="z60i:~RenderingHints" resolve="RenderingHints" />
                 <ref role="3cqZAo" to="z60i:~RenderingHints.KEY_ANTIALIASING" resolve="KEY_ANTIALIASING" />
@@ -31419,7 +31419,7 @@
               <ref role="3cqZAo" node="3WU9yfA8xFx" resolve="g2d" />
             </node>
             <node concept="liA8E" id="3WU9yfA8xGL" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics2D.setPaint(java.awt.Paint):void" resolve="setPaint" />
+              <ref role="37wK5l" to="z60i:~Graphics2D.setPaint(java.awt.Paint)" resolve="setPaint" />
               <node concept="10M0yZ" id="3WU9yfA8yqp" role="37wK5m">
                 <ref role="1PxDUh" to="z60i:~Color" resolve="Color" />
                 <ref role="3cqZAo" to="z60i:~Color.BLACK" resolve="BLACK" />
@@ -31438,7 +31438,7 @@
               <ref role="3cqZAo" node="3WU9yfA8xFx" resolve="g2d" />
             </node>
             <node concept="liA8E" id="3WU9yfA8xGT" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics2D.drawString(java.lang.String,int,int):void" resolve="drawString" />
+              <ref role="37wK5l" to="z60i:~Graphics2D.drawString(java.lang.String,int,int)" resolve="drawString" />
               <node concept="37vLTw" id="3WU9yfA8xFR" role="37wK5m">
                 <ref role="3cqZAo" node="3WU9yfA8xEm" resolve="iconText" />
               </node>
@@ -31511,7 +31511,7 @@
         <node concept="3clFbH" id="19wqdqNVq8I" role="3cqZAp" />
         <node concept="3clFbF" id="19wqdqNXqO9" role="3cqZAp">
           <node concept="2YIFZM" id="19wqdqNXqYM" role="3clFbG">
-            <ref role="37wK5l" to="iljd:~RxJavaPlugins.setOnSingleSubscribe(io.reactivex.functions.BiFunction):void" resolve="setOnSingleSubscribe" />
+            <ref role="37wK5l" to="iljd:~RxJavaPlugins.setOnSingleSubscribe(io.reactivex.functions.BiFunction)" resolve="setOnSingleSubscribe" />
             <ref role="1Pybhc" to="iljd:~RxJavaPlugins" resolve="RxJavaPlugins" />
             <node concept="1bVj0M" id="19wqdqNXr4e" role="37wK5m">
               <node concept="37vLTG" id="19wqdqNXr9q" role="1bW2Oz">
@@ -31557,7 +31557,7 @@
                                   <ref role="3cqZAo" node="19wqdqNX_ay" resolve="singleObserver" />
                                 </node>
                                 <node concept="liA8E" id="19wqdqNXEvz" role="2OqNvi">
-                                  <ref role="37wK5l" to="unkn:~SingleObserver.onSubscribe(io.reactivex.disposables.Disposable):void" resolve="onSubscribe" />
+                                  <ref role="37wK5l" to="unkn:~SingleObserver.onSubscribe(io.reactivex.disposables.Disposable)" resolve="onSubscribe" />
                                   <node concept="37vLTw" id="19wqdqNXF0M" role="37wK5m">
                                     <ref role="3cqZAo" node="19wqdqNXBxy" resolve="disposable" />
                                   </node>
@@ -31593,7 +31593,7 @@
                                           <ref role="3cqZAo" node="19wqdqNX_ay" resolve="singleObserver" />
                                         </node>
                                         <node concept="liA8E" id="19wqdqNXG42" role="2OqNvi">
-                                          <ref role="37wK5l" to="unkn:~SingleObserver.onSuccess(java.lang.Object):void" resolve="onSuccess" />
+                                          <ref role="37wK5l" to="unkn:~SingleObserver.onSuccess(java.lang.Object)" resolve="onSuccess" />
                                           <node concept="37vLTw" id="19wqdqNXGwN" role="37wK5m">
                                             <ref role="3cqZAo" node="19wqdqNXBxF" resolve="object" />
                                           </node>
@@ -31627,7 +31627,7 @@
                                   <ref role="3cqZAo" node="19wqdqNX_ay" resolve="singleObserver" />
                                 </node>
                                 <node concept="liA8E" id="19wqdqNXJj9" role="2OqNvi">
-                                  <ref role="37wK5l" to="unkn:~SingleObserver.onError(java.lang.Throwable):void" resolve="onError" />
+                                  <ref role="37wK5l" to="unkn:~SingleObserver.onError(java.lang.Throwable)" resolve="onError" />
                                   <node concept="37vLTw" id="19wqdqNXKbC" role="37wK5m">
                                     <ref role="3cqZAo" node="19wqdqNXBxO" resolve="throwable" />
                                   </node>
@@ -31650,7 +31650,7 @@
         <node concept="3clFbH" id="19wqdqO13L_" role="3cqZAp" />
         <node concept="3clFbF" id="19wqdqO140P" role="3cqZAp">
           <node concept="2YIFZM" id="19wqdqO14Us" role="3clFbG">
-            <ref role="37wK5l" to="iljd:~RxJavaPlugins.setOnCompletableSubscribe(io.reactivex.functions.BiFunction):void" resolve="setOnCompletableSubscribe" />
+            <ref role="37wK5l" to="iljd:~RxJavaPlugins.setOnCompletableSubscribe(io.reactivex.functions.BiFunction)" resolve="setOnCompletableSubscribe" />
             <ref role="1Pybhc" to="iljd:~RxJavaPlugins" resolve="RxJavaPlugins" />
             <node concept="1bVj0M" id="19wqdqO14Ut" role="37wK5m">
               <node concept="37vLTG" id="19wqdqO14Uu" role="1bW2Oz">
@@ -31696,7 +31696,7 @@
                                   <ref role="3cqZAo" node="19wqdqO14Uw" resolve="completableObserver" />
                                 </node>
                                 <node concept="liA8E" id="19wqdqO14UM" role="2OqNvi">
-                                  <ref role="37wK5l" to="unkn:~CompletableObserver.onSubscribe(io.reactivex.disposables.Disposable):void" resolve="onSubscribe" />
+                                  <ref role="37wK5l" to="unkn:~CompletableObserver.onSubscribe(io.reactivex.disposables.Disposable)" resolve="onSubscribe" />
                                   <node concept="37vLTw" id="19wqdqO14UN" role="37wK5m">
                                     <ref role="3cqZAo" node="19wqdqO17Ua" resolve="disposable" />
                                   </node>
@@ -31725,7 +31725,7 @@
                                           <ref role="3cqZAo" node="19wqdqO14Uw" resolve="completableObserver" />
                                         </node>
                                         <node concept="liA8E" id="19wqdqO14V2" role="2OqNvi">
-                                          <ref role="37wK5l" to="unkn:~CompletableObserver.onComplete():void" resolve="onComplete" />
+                                          <ref role="37wK5l" to="unkn:~CompletableObserver.onComplete()" resolve="onComplete" />
                                         </node>
                                       </node>
                                     </node>
@@ -31755,7 +31755,7 @@
                                   <ref role="3cqZAo" node="19wqdqO14Uw" resolve="completableObserver" />
                                 </node>
                                 <node concept="liA8E" id="19wqdqO14Ve" role="2OqNvi">
-                                  <ref role="37wK5l" to="unkn:~CompletableObserver.onError(java.lang.Throwable):void" resolve="onError" />
+                                  <ref role="37wK5l" to="unkn:~CompletableObserver.onError(java.lang.Throwable)" resolve="onError" />
                                   <node concept="37vLTw" id="19wqdqO14Vf" role="37wK5m">
                                     <ref role="3cqZAo" node="19wqdqO17Up" resolve="throwable" />
                                   </node>
@@ -31775,7 +31775,7 @@
         <node concept="3clFbH" id="19wqdqO140O" role="3cqZAp" />
         <node concept="3clFbF" id="2mbQB8J3N58" role="3cqZAp">
           <node concept="2YIFZM" id="2mbQB8J3N6$" role="3clFbG">
-            <ref role="37wK5l" to="m4y7:~Schedulers.start():void" resolve="start" />
+            <ref role="37wK5l" to="m4y7:~Schedulers.start()" resolve="start" />
             <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
           </node>
         </node>
@@ -31785,7 +31785,7 @@
       <node concept="3clFbS" id="2mbQB8J3N7e" role="2VODD2">
         <node concept="3clFbF" id="2mbQB8J3N7P" role="3cqZAp">
           <node concept="2YIFZM" id="19wqdqNYiZp" role="3clFbG">
-            <ref role="37wK5l" to="m4y7:~Schedulers.shutdown():void" resolve="shutdown" />
+            <ref role="37wK5l" to="m4y7:~Schedulers.shutdown()" resolve="shutdown" />
             <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
           </node>
         </node>
diff --git a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
index 491c6584..faada935 100644
--- a/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
+++ b/coderules/solutions/jetbrains.mps.coderules/jetbrains.mps.coderules.msd
@@ -38,7 +38,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
index 0fc8a933..bfc323e7 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/plugin.mps
@@ -6,7 +6,7 @@
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
   <imports>
diff --git a/coderules/solutions/jetbrains.mps.coderules/models/service.mps b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
index a903366e..d9b67dc1 100644
--- a/coderules/solutions/jetbrains.mps.coderules/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules/models/service.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
@@ -621,7 +621,7 @@
               <ref role="3cqZAo" node="Hg6Enc3ZJX" resolve="prevStep" />
             </node>
             <node concept="liA8E" id="Hg6Enc4hNz" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="Hg6Enc4Jpw" role="37wK5m">
                 <node concept="37vLTG" id="Hg6Enc4Ka2" role="1bW2Oz">
                   <property role="TrG5h" value="prevStep" />
@@ -705,7 +705,7 @@
                                 </node>
                                 <node concept="2YIFZM" id="Hg6Enc4Wbh" role="37vLTx">
                                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object):java.lang.String" resolve="valueOf" />
+                                  <ref role="37wK5l" to="wyt6:~String.valueOf(java.lang.Object)" resolve="valueOf" />
                                   <node concept="2OqwBi" id="Hg6Enc4Wbi" role="37wK5m">
                                     <node concept="2JrnkZ" id="Hg6Enc4Wbj" role="2Oq$k0">
                                       <node concept="37vLTw" id="7kTeLbPtLvc" role="2JrQYb">
@@ -713,7 +713,7 @@
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="Hg6Enc4Wbl" role="2OqNvi">
-                                      <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                                      <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
                                     </node>
                                   </node>
                                 </node>
@@ -1212,7 +1212,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6kREIVkgMSA" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="6kREIVkgMSB" role="37wK5m">
                 <node concept="37vLTG" id="6kREIVkmlHv" role="1bW2Oz">
                   <property role="TrG5h" value="prev" />
@@ -1224,7 +1224,7 @@
                   <node concept="3clFbF" id="6kREIVkgMSD" role="3cqZAp">
                     <node concept="37vLTI" id="6kREIVkgMSE" role="3clFbG">
                       <node concept="2YIFZM" id="6kREIVkgMSF" role="37vLTx">
-                        <ref role="37wK5l" to="wyt6:~System.nanoTime():long" resolve="nanoTime" />
+                        <ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
                         <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                       </node>
                       <node concept="2OqwBi" id="6kREIVkgMSG" role="37vLTJ">
@@ -1541,7 +1541,7 @@
                 <ref role="3cqZAo" node="55Q$YFtJK$A" resolve="prevStep" />
               </node>
               <node concept="liA8E" id="55Q$YFtJUbQ" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+                <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
                 <node concept="1bVj0M" id="55Q$YFtJUbR" role="37wK5m">
                   <node concept="37vLTG" id="55Q$YFtJUbS" role="1bW2Oz">
                     <property role="TrG5h" value="prev" />
@@ -1616,14 +1616,14 @@
                 <ref role="3cqZAo" node="55Q$YFtHZC$" resolve="prevStepWithTrace" />
               </node>
               <node concept="liA8E" id="Hg6End2UXi" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
+                <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
                 <node concept="37vLTw" id="Hg6End2Z2Y" role="37wK5m">
                   <ref role="3cqZAo" node="55Q$YFtIho8" resolve="subscribeScheduler" />
                 </node>
               </node>
             </node>
             <node concept="liA8E" id="Hg6Enc6FMP" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="Hg6Enc6Hx2" role="37wK5m">
                 <node concept="3clFbS" id="Hg6Enc6Hx3" role="1bW5cS">
                   <node concept="3clFbH" id="Hg6Enc9KMF" role="3cqZAp" />
@@ -1675,10 +1675,10 @@
                             <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                           </node>
                           <node concept="2YIFZM" id="23c4kVtm7Im" role="33vP2m">
-                            <ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String):java.lang.Boolean" resolve="valueOf" />
+                            <ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String)" resolve="valueOf" />
                             <ref role="1Pybhc" to="wyt6:~Boolean" resolve="Boolean" />
                             <node concept="2YIFZM" id="23c4kVtm7In" role="37wK5m">
-                              <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String):java.lang.String" resolve="getProperty" />
+                              <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String)" resolve="getProperty" />
                               <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                               <node concept="Xl_RD" id="23c4kVtm7Io" role="37wK5m">
                                 <property role="Xl_RC" value="logic.profile" />
@@ -1697,10 +1697,10 @@
                             <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
                           </node>
                           <node concept="2YIFZM" id="23c4kVtm90x" role="33vP2m">
-                            <ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String):java.lang.Boolean" resolve="valueOf" />
+                            <ref role="37wK5l" to="wyt6:~Boolean.valueOf(java.lang.String)" resolve="valueOf" />
                             <ref role="1Pybhc" to="wyt6:~Boolean" resolve="Boolean" />
                             <node concept="2YIFZM" id="23c4kVtm90y" role="37wK5m">
-                              <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String):java.lang.String" resolve="getProperty" />
+                              <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String)" resolve="getProperty" />
                               <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                               <node concept="Xl_RD" id="23c4kVtm90z" role="37wK5m">
                                 <property role="Xl_RC" value="logic.checkGarbage" />
@@ -1799,7 +1799,7 @@
                                                 <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
                                               </node>
                                               <node concept="liA8E" id="7WKNeR9_puh" role="2OqNvi">
-                                                <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object):void" resolve="set" />
+                                                <ref role="37wK5l" to="18ew:~Reference.set(java.lang.Object)" resolve="set" />
                                                 <node concept="37vLTw" id="7WKNeR9_pSd" role="37wK5m">
                                                   <ref role="3cqZAo" node="7WKNeR9$e5g" resolve="observer" />
                                                 </node>
@@ -1990,7 +1990,7 @@
                                       <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
                                     </node>
                                     <node concept="liA8E" id="7WKNeR9_ybk" role="2OqNvi">
-                                      <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                      <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
                                     </node>
                                   </node>
                                   <node concept="liA8E" id="7WKNeR9$NVL" role="2OqNvi">
@@ -2017,7 +2017,7 @@
                                   <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
                                 </node>
                                 <node concept="liA8E" id="7WKNeR9_waj" role="2OqNvi">
-                                  <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                  <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
                                 </node>
                               </node>
                             </node>
@@ -2098,7 +2098,7 @@
                                         <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
                                       </node>
                                       <node concept="liA8E" id="7WKNeR9_Cwm" role="2OqNvi">
-                                        <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                        <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="7WKNeR9$mx1" role="2OqNvi">
@@ -2117,7 +2117,7 @@
                                     <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
                                   </node>
                                   <node concept="liA8E" id="7WKNeR9__Ke" role="2OqNvi">
-                                    <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                    <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
                                   </node>
                                 </node>
                               </node>
@@ -2197,7 +2197,7 @@
                                   <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
                                 </node>
                                 <node concept="liA8E" id="7WKNeR9_I5L" role="2OqNvi">
-                                  <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                                  <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
                                 </node>
                               </node>
                               <node concept="liA8E" id="7WKNeR9$wYC" role="2OqNvi">
@@ -2216,7 +2216,7 @@
                               <ref role="3cqZAo" node="7WKNeR9_f8w" resolve="queryObserver" />
                             </node>
                             <node concept="liA8E" id="7WKNeR9_FeI" role="2OqNvi">
-                              <ref role="37wK5l" to="18ew:~Reference.get():java.lang.Object" resolve="get" />
+                              <ref role="37wK5l" to="18ew:~Reference.get()" resolve="get" />
                             </node>
                           </node>
                         </node>
@@ -2276,10 +2276,10 @@
               <node concept="37vLTI" id="6kREIVky9JE" role="3clFbG">
                 <node concept="2YIFZM" id="6kREIVky9JF" role="37vLTx">
                   <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                  <ref role="37wK5l" to="wyt6:~Integer.parseUnsignedInt(java.lang.String):int" resolve="parseUnsignedInt" />
+                  <ref role="37wK5l" to="wyt6:~Integer.parseUnsignedInt(java.lang.String)" resolve="parseUnsignedInt" />
                   <node concept="2YIFZM" id="6kREIVky9JG" role="37wK5m">
                     <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                    <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String):java.lang.String" resolve="getProperty" />
+                    <ref role="37wK5l" to="wyt6:~System.getProperty(java.lang.String,java.lang.String)" resolve="getProperty" />
                     <node concept="Xl_RD" id="6kREIVky9JH" role="37wK5m">
                       <property role="Xl_RC" value="logic.timeout" />
                     </node>
@@ -2325,7 +2325,7 @@
             <property role="3TUv4t" value="true" />
             <node concept="3cpWsb" id="6kREIVky9JW" role="1tU5fm" />
             <node concept="2YIFZM" id="6kREIVky9JX" role="33vP2m">
-              <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+              <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
               <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
             </node>
           </node>
@@ -2374,7 +2374,7 @@
                           </node>
                           <node concept="3cpWsd" id="6kREIVkyFHH" role="3uHU7B">
                             <node concept="2YIFZM" id="6kREIVkyFHI" role="3uHU7B">
-                              <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                              <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
                               <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                             </node>
                             <node concept="37vLTw" id="6kREIVkyFHJ" role="3uHU7w">
@@ -2572,7 +2572,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLcQbL" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.activate(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="activate" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.activate(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence)" resolve="activate" />
                   <node concept="37vLTw" id="5mg4ZgLcRet" role="37wK5m">
                     <ref role="3cqZAo" node="7nPD14NbLuI" resolve="occurrence" />
                   </node>
@@ -2631,7 +2631,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLcSnM" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.reactivate(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="reactivate" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.reactivate(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence)" resolve="reactivate" />
                   <node concept="37vLTw" id="5mg4ZgLcSnN" role="37wK5m">
                     <ref role="3cqZAo" node="7nPD14NbLuQ" resolve="occurrence" />
                   </node>
@@ -2690,7 +2690,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLcV4z" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.suspend(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="suspend" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.suspend(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence)" resolve="suspend" />
                   <node concept="37vLTw" id="5mg4ZgLcV4$" role="37wK5m">
                     <ref role="3cqZAo" node="7nPD14NbLuY" resolve="occurrence" />
                   </node>
@@ -2749,7 +2749,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLcXPi" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.discard(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence):void" resolve="discard" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.discard(jetbrains.mps.logic.reactor.evaluation.ConstraintOccurrence)" resolve="discard" />
                   <node concept="37vLTw" id="5mg4ZgLcXPj" role="37wK5m">
                     <ref role="3cqZAo" node="7nPD14NbLv6" resolve="occurrence" />
                   </node>
@@ -2808,7 +2808,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLd0CJ" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.trying(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="trying" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.trying(jetbrains.mps.logic.reactor.evaluation.RuleMatch)" resolve="trying" />
                   <node concept="37vLTw" id="5mg4ZgLd2rq" role="37wK5m">
                     <ref role="3cqZAo" node="2UGjFq4bW0h" resolve="matchRule" />
                   </node>
@@ -2867,7 +2867,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLd4fK" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.reject(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="reject" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.reject(jetbrains.mps.logic.reactor.evaluation.RuleMatch)" resolve="reject" />
                   <node concept="37vLTw" id="5mg4ZgLd4fL" role="37wK5m">
                     <ref role="3cqZAo" node="2T1p0CFMVBA" resolve="matchRule" />
                   </node>
@@ -2926,7 +2926,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLd70F" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.trigger(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="trigger" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.trigger(jetbrains.mps.logic.reactor.evaluation.RuleMatch)" resolve="trigger" />
                   <node concept="37vLTw" id="5mg4ZgLd70G" role="37wK5m">
                     <ref role="3cqZAo" node="7nPD14NbLve" resolve="matchRule" />
                   </node>
@@ -2985,7 +2985,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLd9Lq" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.retry(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="retry" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.retry(jetbrains.mps.logic.reactor.evaluation.RuleMatch)" resolve="retry" />
                   <node concept="37vLTw" id="5mg4ZgLd9Lr" role="37wK5m">
                     <ref role="3cqZAo" node="2_NfR5wi4YF" resolve="matchRule" />
                   </node>
@@ -3044,7 +3044,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLdbU1" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.finish(jetbrains.mps.logic.reactor.evaluation.RuleMatch):void" resolve="finish" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.finish(jetbrains.mps.logic.reactor.evaluation.RuleMatch)" resolve="finish" />
                   <node concept="37vLTw" id="5mg4ZgLdbU2" role="37wK5m">
                     <ref role="3cqZAo" node="2UGjFq4bWOF" resolve="matchRule" />
                   </node>
@@ -3103,7 +3103,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLde2z" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.tell(jetbrains.mps.logic.reactor.evaluation.PredicateInvocation):void" resolve="tell" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.tell(jetbrains.mps.logic.reactor.evaluation.PredicateInvocation)" resolve="tell" />
                   <node concept="37vLTw" id="5mg4ZgLdgtG" role="37wK5m">
                     <ref role="3cqZAo" node="2UGjFq4bXFj" resolve="invocation" />
                   </node>
@@ -3166,7 +3166,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5mg4ZgLdhHd" role="2OqNvi">
-                  <ref role="37wK5l" to="w7la:~EvaluationTrace.ask(boolean,jetbrains.mps.logic.reactor.evaluation.PredicateInvocation):void" resolve="ask" />
+                  <ref role="37wK5l" to="w7la:~EvaluationTrace.ask(boolean,jetbrains.mps.logic.reactor.evaluation.PredicateInvocation)" resolve="ask" />
                   <node concept="37vLTw" id="5mg4ZgLdkzX" role="37wK5m">
                     <ref role="3cqZAo" node="2UGjFq4bXFr" resolve="result" />
                   </node>
@@ -3515,7 +3515,7 @@
         <node concept="3clFbF" id="19wqdqO45Oo" role="3cqZAp">
           <node concept="2YIFZM" id="19wqdqO45Oq" role="3clFbG">
             <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
-            <ref role="37wK5l" to="m4y7:~Schedulers.from(java.util.concurrent.Executor):io.reactivex.Scheduler" resolve="from" />
+            <ref role="37wK5l" to="m4y7:~Schedulers.from(java.util.concurrent.Executor)" resolve="from" />
             <node concept="10M0yZ" id="19wqdqO45Or" role="37wK5m">
               <ref role="1PxDUh" to="e5vs:~PooledThreadExecutor" resolve="PooledThreadExecutor" />
               <ref role="3cqZAo" to="e5vs:~PooledThreadExecutor.INSTANCE" resolve="INSTANCE" />
@@ -3539,7 +3539,7 @@
         <node concept="3cpWs6" id="3KwBCAA_Uqd" role="3cqZAp">
           <node concept="2YIFZM" id="3KwBCAA_Uqe" role="3cqZAk">
             <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
-            <ref role="37wK5l" to="m4y7:~Schedulers.trampoline():io.reactivex.Scheduler" resolve="trampoline" />
+            <ref role="37wK5l" to="m4y7:~Schedulers.trampoline()" resolve="trampoline" />
           </node>
         </node>
       </node>
@@ -3557,20 +3557,20 @@
             <node concept="3clFbS" id="3KwBCAA_rFk" role="9aQI4">
               <node concept="3cpWs6" id="3KwBCAA_rFl" role="3cqZAp">
                 <node concept="2YIFZM" id="3KwBCAA_sPN" role="3cqZAk">
-                  <ref role="37wK5l" to="f4yq:~SwingSchedulers.edt():io.reactivex.Scheduler" resolve="edt" />
+                  <ref role="37wK5l" to="f4yq:~SwingSchedulers.edt()" resolve="edt" />
                   <ref role="1Pybhc" to="f4yq:~SwingSchedulers" resolve="SwingSchedulers" />
                 </node>
               </node>
             </node>
           </node>
           <node concept="2YIFZM" id="3KwBCAA_stb" role="3clFbw">
-            <ref role="37wK5l" to="dxuu:~SwingUtilities.isEventDispatchThread():boolean" resolve="isEventDispatchThread" />
+            <ref role="37wK5l" to="dxuu:~SwingUtilities.isEventDispatchThread()" resolve="isEventDispatchThread" />
             <ref role="1Pybhc" to="dxuu:~SwingUtilities" resolve="SwingUtilities" />
           </node>
           <node concept="3clFbS" id="3KwBCAA_s6R" role="3clFbx">
             <node concept="3cpWs6" id="3KwBCAA_st_" role="3cqZAp">
               <node concept="2YIFZM" id="3KwBCAA_stA" role="3cqZAk">
-                <ref role="37wK5l" to="m4y7:~Schedulers.trampoline():io.reactivex.Scheduler" resolve="trampoline" />
+                <ref role="37wK5l" to="m4y7:~Schedulers.trampoline()" resolve="trampoline" />
                 <ref role="1Pybhc" to="m4y7:~Schedulers" resolve="Schedulers" />
               </node>
             </node>
@@ -3766,7 +3766,7 @@
               <ref role="37wK5l" node="Hg6End$aLl" resolve="scheduleExecute" />
             </node>
             <node concept="liA8E" id="Hg6EncO4Vl" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.subscribe(io.reactivex.SingleObserver):void" resolve="subscribe" />
+              <ref role="37wK5l" to="unkn:~Single.subscribe(io.reactivex.SingleObserver)" resolve="subscribe" />
               <node concept="2ShNRf" id="Hg6EncPovE" role="37wK5m">
                 <node concept="YeOm9" id="Hg6EncPqlx" role="2ShVmc">
                   <node concept="1Y3b0j" id="Hg6EncPql$" role="YeSDq">
@@ -3822,7 +3822,7 @@
                                   <ref role="3cqZAo" node="Hg6EncPqlI" resolve="thr" />
                                 </node>
                                 <node concept="liA8E" id="4UWJfzxWevZ" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                                  <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                 </node>
                               </node>
                             </node>
@@ -3865,7 +3865,7 @@
               <ref role="37wK5l" node="Hg6End$aLl" resolve="scheduleExecute" />
             </node>
             <node concept="liA8E" id="Hg6EncO4cq" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.subscribe(io.reactivex.SingleObserver):void" resolve="subscribe" />
+              <ref role="37wK5l" to="unkn:~Single.subscribe(io.reactivex.SingleObserver)" resolve="subscribe" />
               <node concept="37vLTw" id="Hg6EncO4t0" role="37wK5m">
                 <ref role="3cqZAo" node="Hg6EncNd4t" resolve="observer" />
               </node>
@@ -3927,7 +3927,7 @@
             </node>
             <node concept="2YIFZM" id="6kREIVkCl_L" role="33vP2m">
               <ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
-              <ref role="37wK5l" to="unkn:~Single.just(java.lang.Object):io.reactivex.Single" resolve="just" />
+              <ref role="37wK5l" to="unkn:~Single.just(java.lang.Object)" resolve="just" />
               <node concept="2ShNRf" id="6kREIVkCl_M" role="37wK5m">
                 <node concept="HV5vD" id="6kREIVkCl_N" role="2ShVmc">
                   <ref role="HV5vE" node="Hg6Enc_35l" resolve="InitStep" />
@@ -4006,7 +4006,7 @@
                 <ref role="3cqZAo" node="4BHjwwGi7In" resolve="last" />
               </node>
               <node concept="liA8E" id="4BHjwwGLnNl" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+                <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
                 <node concept="1bVj0M" id="4BHjwwGLp1f" role="37wK5m">
                   <node concept="37vLTG" id="4BHjwwGLq3q" role="1bW2Oz">
                     <property role="TrG5h" value="step" />
@@ -4078,7 +4078,7 @@
               </node>
             </node>
             <node concept="liA8E" id="19wqdqNSTzi" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="subscribeOn" />
+              <ref role="37wK5l" to="unkn:~Single.subscribeOn(io.reactivex.Scheduler)" resolve="subscribeOn" />
               <node concept="37vLTw" id="19wqdqNSVSy" role="37wK5m">
                 <ref role="3cqZAo" node="2mbQB8J5_aK" resolve="subscribeScheduler" />
               </node>
@@ -4115,7 +4115,7 @@
               <ref role="3cqZAo" node="6kREIVkpzoM" resolve="step" />
             </node>
             <node concept="liA8E" id="6kREIVkq2ib" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.doOnSuccess(io.reactivex.functions.Consumer):io.reactivex.Single" resolve="doOnSuccess" />
+              <ref role="37wK5l" to="unkn:~Single.doOnSuccess(io.reactivex.functions.Consumer)" resolve="doOnSuccess" />
               <node concept="1bVj0M" id="6kREIVkq8QF" role="37wK5m">
                 <node concept="3clFbS" id="6kREIVkq8QG" role="1bW5cS">
                   <node concept="3clFbF" id="6kREIVku5V4" role="3cqZAp">
@@ -4172,7 +4172,7 @@
               <ref role="3cqZAo" node="6kREIVke7Pf" resolve="single" />
             </node>
             <node concept="liA8E" id="6kREIVkeglV" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.onErrorReturn(io.reactivex.functions.Function):io.reactivex.Single" resolve="onErrorReturn" />
+              <ref role="37wK5l" to="unkn:~Single.onErrorReturn(io.reactivex.functions.Function)" resolve="onErrorReturn" />
               <node concept="1bVj0M" id="6kREIVkftIa" role="37wK5m">
                 <node concept="3clFbS" id="6kREIVkftIc" role="1bW5cS">
                   <node concept="3clFbH" id="2HYHa0WUUhS" role="3cqZAp" />
@@ -4207,7 +4207,7 @@
                               <ref role="3cqZAo" node="6kREIVkerkd" resolve="resume" />
                             </node>
                             <node concept="liA8E" id="4BHjwwGLj1L" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~Throwable.getCause():java.lang.Throwable" resolve="getCause" />
+                              <ref role="37wK5l" to="wyt6:~Throwable.getCause()" resolve="getCause" />
                             </node>
                           </node>
                         </node>
@@ -4226,7 +4226,7 @@
                                 <ref role="3cqZAo" node="4BHjwwGLj1I" resolve="cause" />
                               </node>
                               <node concept="liA8E" id="4BHjwwGLhZI" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~Throwable.addSuppressed(java.lang.Throwable):void" resolve="addSuppressed" />
+                                <ref role="37wK5l" to="wyt6:~Throwable.addSuppressed(java.lang.Throwable)" resolve="addSuppressed" />
                                 <node concept="37vLTw" id="4BHjwwGLihh" role="37wK5m">
                                   <ref role="3cqZAo" node="4BHjwwGKJA$" resolve="failure" />
                                 </node>
@@ -4245,7 +4245,7 @@
                                   <ref role="3cqZAo" node="6kREIVkftXC" resolve="t" />
                                 </node>
                                 <node concept="liA8E" id="5lxnBcU2ydy" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                                  <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                 </node>
                               </node>
                             </node>
@@ -4347,7 +4347,7 @@
                                     <ref role="3cqZAo" node="6kREIVkftXC" resolve="t" />
                                   </node>
                                   <node concept="liA8E" id="6kREIVkk1YN" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                                    <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                                   </node>
                                 </node>
                               </node>
@@ -4384,7 +4384,7 @@
                                 <ref role="3cqZAo" node="6kREIVkftXC" resolve="t" />
                               </node>
                               <node concept="liA8E" id="5lxnBcU2zaZ" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~Throwable.getMessage():java.lang.String" resolve="getMessage" />
+                                <ref role="37wK5l" to="wyt6:~Throwable.getMessage()" resolve="getMessage" />
                               </node>
                             </node>
                           </node>
@@ -4398,7 +4398,7 @@
                                   <ref role="3cqZAo" node="6kREIVkftXC" resolve="t" />
                                 </node>
                                 <node concept="liA8E" id="4BHjwwGLmpD" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~Throwable.addSuppressed(java.lang.Throwable):void" resolve="addSuppressed" />
+                                  <ref role="37wK5l" to="wyt6:~Throwable.addSuppressed(java.lang.Throwable)" resolve="addSuppressed" />
                                   <node concept="37vLTw" id="4BHjwwGLmEx" role="37wK5m">
                                     <ref role="3cqZAo" node="4BHjwwGKJA$" resolve="failure" />
                                   </node>
@@ -4540,7 +4540,7 @@
                       <ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
                     </node>
                     <node concept="liA8E" id="2mbQB8JmeFm" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
                     </node>
                   </node>
                 </node>
@@ -4562,7 +4562,7 @@
                         <ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
                       </node>
                       <node concept="liA8E" id="Hg6EnchKQ2" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+                        <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
                       </node>
                     </node>
                   </node>
@@ -4629,7 +4629,7 @@
                         </node>
                       </node>
                       <node concept="2YIFZM" id="1N_0WA5JZX7" role="3uHU7B">
-                        <ref role="37wK5l" to="wyt6:~System.nanoTime():long" resolve="nanoTime" />
+                        <ref role="37wK5l" to="wyt6:~System.nanoTime()" resolve="nanoTime" />
                         <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
                       </node>
                     </node>
@@ -4646,10 +4646,10 @@
                   <ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
                 </node>
                 <node concept="liA8E" id="1N_0WA5JWB9" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="2YIFZM" id="1N_0WA5JWBa" role="37wK5m">
                     <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                    <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                     <node concept="3cpWs3" id="1N_0WA5JWBb" role="37wK5m">
                       <node concept="Xl_RD" id="1N_0WA5JWBc" role="3uHU7w">
                         <property role="Xl_RC" value=" -- %s (took %2$Ts.%2$TLs)\n" />
@@ -4700,14 +4700,14 @@
                     <ref role="3cqZAo" node="1pPth$lAEQs" resolve="feedback" />
                   </node>
                   <node concept="liA8E" id="1N_0WA5Kln7" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                    <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                     <node concept="37vLTw" id="1N_0WA5KlZs" role="37wK5m">
                       <ref role="3cqZAo" node="1N_0WA5Kg9W" resolve="errorMsg" />
                     </node>
                   </node>
                 </node>
                 <node concept="liA8E" id="1N_0WA5Kmgw" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="Xl_RD" id="1N_0WA5Km$P" role="37wK5m">
                     <property role="Xl_RC" value="\n" />
                   </node>
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd b/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd
index bc760059..c52da0d0 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/jetbrains.mps.controlflow.ui.msd
@@ -30,7 +30,7 @@
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
     <language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
index ea61cc53..33db5595 100644
--- a/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow.ui/models/plugin.mps
@@ -5,7 +5,7 @@
     <use id="ef7bf5ac-d06c-4342-b11d-e42104eb9343" name="jetbrains.mps.lang.plugin.standalone" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="0" />
@@ -441,7 +441,7 @@
             <node concept="3Tqbb2" id="6hqFpWnfbDz" role="1tU5fm" />
             <node concept="2OqwBi" id="6hqFpWnfbD$" role="33vP2m">
               <node concept="liA8E" id="6hqFpWnfbDC" role="2OqNvi">
-                <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot():org.jetbrains.mps.openapi.model.SNode" resolve="getContainingRoot" />
+                <ref role="37wK5l" to="mhbf:~SNode.getContainingRoot()" resolve="getContainingRoot" />
               </node>
               <node concept="37vLTw" id="6hqFpWnfcn_" role="2Oq$k0">
                 <ref role="3cqZAo" node="6hqFpWnfbqG" resolve="node" />
@@ -471,7 +471,7 @@
                   <ref role="3cqZAo" node="6hqFpWnfhk_" resolve="mpsProject" />
                 </node>
                 <node concept="liA8E" id="78H58oetzW8" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                 </node>
               </node>
             </node>
@@ -501,7 +501,7 @@
                     <ref role="3cqZAo" node="6hqFpWnfcD1" resolve="editorComponent" />
                   </node>
                   <node concept="liA8E" id="6hqFpWnfbEg" role="2OqNvi">
-                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
+                    <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
                   </node>
                 </node>
               </node>
@@ -828,7 +828,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="7WKNeR8SQxO" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                 </node>
               </node>
             </node>
@@ -963,13 +963,13 @@
                                     <node concept="2OqwBi" id="7WKNeR8SQyQ" role="3clFbG">
                                       <node concept="2YIFZM" id="7WKNeR8SQyR" role="2Oq$k0">
                                         <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
                                         <node concept="37vLTw" id="78H58oeurAk" role="37wK5m">
                                           <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="7WKNeR8SQyT" role="2OqNvi">
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
                                         <node concept="Xl_RD" id="7WKNeR8SQyU" role="37wK5m">
                                           <property role="Xl_RC" value="Activation Trace" />
                                         </node>
@@ -990,7 +990,7 @@
                                   <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                                 </node>
                                 <node concept="liA8E" id="7WKNeR8SQyZ" role="2OqNvi">
-                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                 </node>
                               </node>
                             </node>
@@ -1012,14 +1012,14 @@
                                   <node concept="3clFbF" id="7WKNeR8SQz9" role="3cqZAp">
                                     <node concept="2OqwBi" id="7WKNeR8SQza" role="3clFbG">
                                       <node concept="2YIFZM" id="7WKNeR8SQzb" role="2Oq$k0">
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project):com.intellij.openapi.wm.ToolWindowManager" resolve="getInstance" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.getInstance(com.intellij.openapi.project.Project)" resolve="getInstance" />
                                         <ref role="1Pybhc" to="jkny:~ToolWindowManager" resolve="ToolWindowManager" />
                                         <node concept="37vLTw" id="78H58oeurTN" role="37wK5m">
                                           <ref role="3cqZAo" node="6hqFpWnfoA9" resolve="ideaProject" />
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="7WKNeR8SQzd" role="2OqNvi">
-                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String):void" resolve="notifyByBalloon" />
+                                        <ref role="37wK5l" to="jkny:~ToolWindowManager.notifyByBalloon(java.lang.String,com.intellij.openapi.ui.MessageType,java.lang.String)" resolve="notifyByBalloon" />
                                         <node concept="Xl_RD" id="7WKNeR8SQze" role="37wK5m">
                                           <property role="Xl_RC" value="Activation Trace" />
                                         </node>
@@ -1040,7 +1040,7 @@
                                   <ref role="3cqZAo" node="6hqFpWnfkNg" resolve="mpsProject" />
                                 </node>
                                 <node concept="liA8E" id="7WKNeR8SQzj" role="2OqNvi">
-                                  <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                                  <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                                 </node>
                               </node>
                             </node>
@@ -1193,7 +1193,7 @@
               <ref role="3cqZAo" node="Hg6EncbkRS" resolve="prevStep" />
             </node>
             <node concept="liA8E" id="5lxnBcU085M" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function):io.reactivex.Single" resolve="flatMap" />
+              <ref role="37wK5l" to="unkn:~Single.flatMap(io.reactivex.functions.Function)" resolve="flatMap" />
               <node concept="1bVj0M" id="5lxnBcU08CP" role="37wK5m">
                 <node concept="37vLTG" id="5lxnBcU09rm" role="1bW2Oz">
                   <property role="TrG5h" value="prev" />
@@ -1220,7 +1220,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="78H58of3fKh" role="2OqNvi">
-                              <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode():org.jetbrains.mps.openapi.model.SNode" resolve="getEditedNode" />
+                              <ref role="37wK5l" to="exr9:~EditorComponent.getEditedNode()" resolve="getEditedNode" />
                             </node>
                           </node>
                           <node concept="2OqwBi" id="78H58of3fKi" role="37wK5m">
@@ -1296,10 +1296,10 @@
                         </node>
                       </node>
                       <node concept="liA8E" id="5lxnBcU0eq5" role="2OqNvi">
-                        <ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource):io.reactivex.Single" resolve="andThen" />
+                        <ref role="37wK5l" to="unkn:~Completable.andThen(io.reactivex.SingleSource)" resolve="andThen" />
                         <node concept="2YIFZM" id="5lxnBcU0gP7" role="37wK5m">
                           <ref role="1Pybhc" to="unkn:~Single" resolve="Single" />
-                          <ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable):io.reactivex.Single" resolve="fromCallable" />
+                          <ref role="37wK5l" to="unkn:~Single.fromCallable(java.util.concurrent.Callable)" resolve="fromCallable" />
                           <node concept="1bVj0M" id="5lxnBcU0iBX" role="37wK5m">
                             <node concept="3clFbS" id="5lxnBcU0iBY" role="1bW5cS">
                               <node concept="3clFbF" id="5lxnBcU0nAW" role="3cqZAp">
@@ -1373,7 +1373,7 @@
               <ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
             </node>
             <node concept="liA8E" id="6Yb9hAqUqv9" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
@@ -1406,7 +1406,7 @@
                   <ref role="3cqZAo" node="55Q$YFtIX9v" resolve="mpsProject" />
                 </node>
                 <node concept="liA8E" id="6kREIVkONuP" role="2OqNvi">
-                  <ref role="37wK5l" to="z1c4:~MPSProject.getProject():com.intellij.openapi.project.Project" resolve="getProject" />
+                  <ref role="37wK5l" to="z1c4:~MPSProject.getProject()" resolve="getProject" />
                 </node>
               </node>
             </node>
@@ -1481,15 +1481,15 @@
                   <ref role="3cqZAo" node="6Yb9hAqUr3u" resolve="prevStep" />
                 </node>
                 <node concept="liA8E" id="6Yb9hAqUIG7" role="2OqNvi">
-                  <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler):io.reactivex.Single" resolve="observeOn" />
+                  <ref role="37wK5l" to="unkn:~Single.observeOn(io.reactivex.Scheduler)" resolve="observeOn" />
                   <node concept="2YIFZM" id="6Yb9hAqUIG8" role="37wK5m">
-                    <ref role="37wK5l" to="f4yq:~SwingSchedulers.edt():io.reactivex.Scheduler" resolve="edt" />
+                    <ref role="37wK5l" to="f4yq:~SwingSchedulers.edt()" resolve="edt" />
                     <ref role="1Pybhc" to="f4yq:~SwingSchedulers" resolve="SwingSchedulers" />
                   </node>
                 </node>
               </node>
               <node concept="liA8E" id="6Yb9hAqUIG9" role="2OqNvi">
-                <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+                <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
                 <node concept="1bVj0M" id="6Yb9hAqUIGa" role="37wK5m">
                   <node concept="3clFbS" id="6Yb9hAqUIGb" role="1bW5cS">
                     <node concept="3clFbH" id="6Yb9hAqUIGc" role="3cqZAp" />
@@ -1551,7 +1551,7 @@
                                 <ref role="3cqZAo" node="6Yb9hAqUIGe" resolve="program" />
                               </node>
                               <node concept="liA8E" id="6Yb9hAqUIG_" role="2OqNvi">
-                                <ref role="37wK5l" to="av0y:~Program.name():java.lang.String" resolve="name" />
+                                <ref role="37wK5l" to="av0y:~Program.name()" resolve="name" />
                               </node>
                             </node>
                           </node>
@@ -1674,7 +1674,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6IQb_Rxsum7" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.doFinally(io.reactivex.functions.Action):io.reactivex.Single" resolve="doFinally" />
+              <ref role="37wK5l" to="unkn:~Single.doFinally(io.reactivex.functions.Action)" resolve="doFinally" />
               <node concept="1bVj0M" id="6IQb_Rxswo2" role="37wK5m">
                 <node concept="3clFbS" id="6IQb_Rxswo3" role="1bW5cS">
                   <node concept="3clFbH" id="6IQb_Rxsy3D" role="3cqZAp" />
@@ -1753,7 +1753,7 @@
                         <ref role="3cqZAo" node="443LGHBSGGx" resolve="mpsProject" />
                       </node>
                       <node concept="liA8E" id="6IQb_Rxsy6n" role="2OqNvi">
-                        <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                        <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                       </node>
                     </node>
                   </node>
diff --git a/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd b/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
index d908ee0f..b5be1e5e 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
+++ b/coderules/solutions/jetbrains.mps.controlflow/jetbrains.mps.controlflow.msd
@@ -18,7 +18,7 @@
     <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
index fcdfd99e..9e266fce 100644
--- a/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
+++ b/coderules/solutions/jetbrains.mps.controlflow/models/service.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="0" />
@@ -232,7 +232,7 @@
               </node>
             </node>
             <node concept="liA8E" id="4t7Xo7iw0Kl" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
               <node concept="37vLTw" id="4t7Xo7iw11c" role="37wK5m">
                 <ref role="3cqZAo" node="4t7Xo7ivP5g" resolve="fqName" />
               </node>
@@ -302,14 +302,14 @@
               <node concept="2OqwBi" id="4t7Xo7ivWyB" role="3uHU7B">
                 <node concept="2OqwBi" id="2Mi2iz0Yf4b" role="2Oq$k0">
                   <node concept="1rXfSq" id="4t7Xo7ivWek" role="2Oq$k0">
-                    <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                    <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                   </node>
                   <node concept="liA8E" id="2Mi2iz0YfRL" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Class.getPackage():java.lang.Package" resolve="getPackage" />
+                    <ref role="37wK5l" to="wyt6:~Class.getPackage()" resolve="getPackage" />
                   </node>
                 </node>
                 <node concept="liA8E" id="4t7Xo7ivWVU" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Package.getName():java.lang.String" resolve="getName" />
+                  <ref role="37wK5l" to="wyt6:~Package.getName()" resolve="getName" />
                 </node>
               </node>
               <node concept="Xl_RD" id="4t7Xo7ivXoD" role="3uHU7w">
@@ -396,7 +396,7 @@
               </node>
             </node>
             <node concept="liA8E" id="6Yb9hAqJTJO" role="2OqNvi">
-              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function):io.reactivex.Single" resolve="map" />
+              <ref role="37wK5l" to="unkn:~Single.map(io.reactivex.functions.Function)" resolve="map" />
               <node concept="1bVj0M" id="6Yb9hAqJUtw" role="37wK5m">
                 <node concept="37vLTG" id="6Yb9hAqJUBz" role="1bW2Oz">
                   <property role="TrG5h" value="step" />
@@ -686,7 +686,7 @@
               <ref role="3cqZAo" to="d6hs:~IssueKindReportItem.TYPESYSTEM" resolve="TYPESYSTEM" />
             </node>
             <node concept="liA8E" id="5t4mtEg03Sb" role="2OqNvi">
-              <ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind(java.lang.String):jetbrains.mps.errors.item.IssueKindReportItem$ItemKind" resolve="deriveItemKind" />
+              <ref role="37wK5l" to="d6hs:~IssueKindReportItem$CheckerCategory.deriveItemKind(java.lang.String)" resolve="deriveItemKind" />
               <node concept="Xl_RD" id="5t4mtEg03Se" role="37wK5m">
                 <property role="Xl_RC" value="control flow" />
               </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
index a8cb3a8b..8a49c2de 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/jetbrains.mps.lang.coderules.template.msd
@@ -23,7 +23,7 @@
     <language slang="l:daafa647-f1f7-4b0b-b096-69cd7c8408c0:jetbrains.mps.baseLanguage.regexp" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
index 545d1675..16895f95 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.aspect.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
@@ -376,13 +376,13 @@
             <node concept="2OqwBi" id="NKt6ynp2kH" role="33vP2m">
               <node concept="2YIFZM" id="NKt6ynp2kI" role="2Oq$k0">
                 <ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
-                <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository):jetbrains.mps.smodel.language.LanguageRegistry" resolve="getInstance" />
+                <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository)" resolve="getInstance" />
                 <node concept="37vLTw" id="NKt6ynp2kJ" role="37wK5m">
                   <ref role="3cqZAo" node="NKt6ynp2k_" resolve="repository" />
                 </node>
               </node>
               <node concept="liA8E" id="NKt6ynp2kK" role="2OqNvi">
-                <ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage):jetbrains.mps.smodel.language.LanguageRuntime" resolve="getLanguage" />
+                <ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage)" resolve="getLanguage" />
                 <node concept="37vLTw" id="NKt6ynp2kL" role="37wK5m">
                   <ref role="3cqZAo" node="NKt6ynp2kz" resolve="slang" />
                 </node>
@@ -467,7 +467,7 @@
                 <node concept="X8dFx" id="52Js5TE$0yw" role="2OqNvi">
                   <node concept="2YIFZM" id="52Js5TE$0D7" role="25WWJ7">
                     <ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
-                    <ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel):java.util.Set" resolve="getAllLanguageImports" />
+                    <ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel)" resolve="getAllLanguageImports" />
                     <node concept="2OqwBi" id="52Js5TE$1LH" role="37wK5m">
                       <node concept="37vLTw" id="52Js5TE$1LI" role="2Oq$k0">
                         <ref role="3cqZAo" node="7mB3viLmiiz" resolve="node" />
@@ -505,11 +505,11 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="7mB3viLmPxl" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNode.getConcept():org.jetbrains.mps.openapi.language.SConcept" resolve="getConcept" />
+                    <ref role="37wK5l" to="mhbf:~SNode.getConcept()" resolve="getConcept" />
                   </node>
                 </node>
                 <node concept="liA8E" id="7mB3viLmQ23" role="2OqNvi">
-                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage():org.jetbrains.mps.openapi.language.SLanguage" resolve="getLanguage" />
+                  <ref role="37wK5l" to="c17a:~SAbstractConcept.getLanguage()" resolve="getLanguage" />
                 </node>
               </node>
             </node>
@@ -614,7 +614,7 @@
                     <node concept="1rXfSq" id="NKt6ynpjDR" role="2Oq$k0">
                       <ref role="37wK5l" node="NKt6ynq5W5" resolve="extendedLangClosure" />
                       <node concept="2YIFZM" id="NKt6ynpjDS" role="37wK5m">
-                        <ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel):java.util.Set" resolve="getAllLanguageImports" />
+                        <ref role="37wK5l" to="w1kc:~SModelOperations.getAllLanguageImports(org.jetbrains.mps.openapi.model.SModel)" resolve="getAllLanguageImports" />
                         <ref role="1Pybhc" to="w1kc:~SModelOperations" resolve="SModelOperations" />
                         <node concept="37vLTw" id="NKt6ynpjDT" role="37wK5m">
                           <ref role="3cqZAo" node="NKt6ynoWQ9" resolve="model" />
@@ -915,14 +915,14 @@
                 </node>
                 <node concept="2OqwBi" id="NKt6ynosk2" role="33vP2m">
                   <node concept="2YIFZM" id="NKt6ynosk3" role="2Oq$k0">
-                    <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository):jetbrains.mps.smodel.language.LanguageRegistry" resolve="getInstance" />
+                    <ref role="37wK5l" to="vndm:~LanguageRegistry.getInstance(org.jetbrains.mps.openapi.module.SRepository)" resolve="getInstance" />
                     <ref role="1Pybhc" to="vndm:~LanguageRegistry" resolve="LanguageRegistry" />
                     <node concept="37vLTw" id="NKt6ynosk4" role="37wK5m">
                       <ref role="3cqZAo" node="NKt6ynoskG" resolve="repository" />
                     </node>
                   </node>
                   <node concept="liA8E" id="NKt6ynosk5" role="2OqNvi">
-                    <ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage):jetbrains.mps.smodel.language.LanguageRuntime" resolve="getLanguage" />
+                    <ref role="37wK5l" to="vndm:~LanguageRegistry.getLanguage(org.jetbrains.mps.openapi.language.SLanguage)" resolve="getLanguage" />
                     <node concept="37vLTw" id="NKt6ynosk6" role="37wK5m">
                       <ref role="3cqZAo" node="NKt6ynoskz" resolve="slang" />
                     </node>
@@ -947,7 +947,7 @@
                           <ref role="3cqZAo" node="NKt6ynoskz" resolve="slang" />
                         </node>
                         <node concept="liA8E" id="NKt6ynoskg" role="2OqNvi">
-                          <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName():java.lang.String" resolve="getQualifiedName" />
+                          <ref role="37wK5l" to="c17a:~SLanguage.getQualifiedName()" resolve="getQualifiedName" />
                         </node>
                       </node>
                     </node>
@@ -986,7 +986,7 @@
                             <ref role="3cqZAo" node="NKt6ynosk0" resolve="langrt" />
                           </node>
                           <node concept="liA8E" id="NKt6ynosky" role="2OqNvi">
-                            <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
+                            <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages()" resolve="getExtendedLanguages" />
                           </node>
                         </node>
                       </node>
@@ -1084,7 +1084,7 @@
                       <ref role="3cqZAo" node="NKt6ynosl9" resolve="langrt" />
                     </node>
                     <node concept="liA8E" id="NKt6ynosl8" role="2OqNvi">
-                      <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
+                      <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages()" resolve="getExtendedLanguages" />
                     </node>
                   </node>
                 </node>
@@ -1612,7 +1612,7 @@
                 <ref role="3cqZAo" node="NKt6ynospH" resolve="langDesc" />
               </node>
               <node concept="liA8E" id="NKt6ynospl" role="2OqNvi">
-                <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages():java.util.Collection" resolve="getExtendedLanguages" />
+                <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendedLanguages()" resolve="getExtendedLanguages" />
               </node>
             </node>
           </node>
@@ -1664,7 +1664,7 @@
                 <ref role="3cqZAo" node="NKt6ynospH" resolve="langDesc" />
               </node>
               <node concept="liA8E" id="NKt6ynospF" role="2OqNvi">
-                <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendingLanguages():java.lang.Iterable" resolve="getExtendingLanguages" />
+                <ref role="37wK5l" to="vndm:~LanguageRuntime.getExtendingLanguages()" resolve="getExtendingLanguages" />
               </node>
             </node>
           </node>
@@ -1793,7 +1793,7 @@
                             <ref role="3cqZAo" node="78H58oefpDM" resolve="lr" />
                           </node>
                           <node concept="liA8E" id="78H58oefroc" role="2OqNvi">
-                            <ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class):jetbrains.mps.smodel.runtime.ILanguageAspect" resolve="getAspect" />
+                            <ref role="37wK5l" to="vndm:~LanguageRuntime.getAspect(java.lang.Class)" resolve="getAspect" />
                             <node concept="37vLTw" id="78H58oefrod" role="37wK5m">
                               <ref role="3cqZAo" node="78H58oefoFj" resolve="aspectClass" />
                             </node>
@@ -1883,7 +1883,7 @@
               <ref role="3cqZAo" node="7P_FdVQ2BHb" resolve="languageRuntime" />
             </node>
             <node concept="liA8E" id="7P_FdVQ4e7J" role="2OqNvi">
-              <ref role="37wK5l" to="i5cy:~AtomicReference.get():java.lang.Object" resolve="get" />
+              <ref role="37wK5l" to="i5cy:~AtomicReference.get()" resolve="get" />
             </node>
           </node>
         </node>
@@ -1910,7 +1910,7 @@
               </node>
             </node>
             <node concept="liA8E" id="7P_FdVQ4fZN" role="2OqNvi">
-              <ref role="37wK5l" to="i5cy:~AtomicReference.compareAndSet(java.lang.Object,java.lang.Object):boolean" resolve="compareAndSet" />
+              <ref role="37wK5l" to="i5cy:~AtomicReference.compareAndSet(java.lang.Object,java.lang.Object)" resolve="compareAndSet" />
               <node concept="10Nm6u" id="7P_FdVQ4g7y" role="37wK5m" />
               <node concept="37vLTw" id="7P_FdVQ4gmf" role="37wK5m">
                 <ref role="3cqZAo" node="7P_FdVQ2PYd" resolve="langrt" />
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
index 60065e2b..4ac46fef 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.macro.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
   </languages>
@@ -350,7 +350,7 @@
                     <ref role="3cqZAo" node="4MEOIDEhznZ" resolve="ref" />
                   </node>
                   <node concept="liA8E" id="4MEOIDEhAWs" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                    <ref role="37wK5l" to="mhbf:~SNodeReference.getNodeId()" resolve="getNodeId" />
                   </node>
                 </node>
               </node>
@@ -381,7 +381,7 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="4MEOIDEip_e" role="2OqNvi">
-                    <ref role="37wK5l" to="mhbf:~SNode.getNodeId():org.jetbrains.mps.openapi.model.SNodeId" resolve="getNodeId" />
+                    <ref role="37wK5l" to="mhbf:~SNode.getNodeId()" resolve="getNodeId" />
                   </node>
                 </node>
               </node>
@@ -404,7 +404,7 @@
                 <ref role="3cqZAo" node="4MEOIDEh_rV" resolve="nodeId" />
               </node>
               <node concept="liA8E" id="4MEOIDEi6Bi" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
               </node>
             </node>
           </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index f9dda4f0..b4dde090 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -5,7 +5,7 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="-1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
   </languages>
@@ -796,19 +796,19 @@
                 </node>
               </node>
               <node concept="2YIFZM" id="1ffsG7bUgPf" role="3uHU7w">
-                <ref role="37wK5l" to="18ew:~NameUtil.compactNamespace(java.lang.String):java.lang.String" resolve="compactNamespace" />
+                <ref role="37wK5l" to="18ew:~NameUtil.compactNamespace(java.lang.String)" resolve="compactNamespace" />
                 <ref role="1Pybhc" to="18ew:~NameUtil" resolve="NameUtil" />
                 <node concept="2OqwBi" id="1ffsG7bUgPg" role="37wK5m">
                   <node concept="2OqwBi" id="1ffsG7bUgPh" role="2Oq$k0">
                     <node concept="1rXfSq" id="1ffsG7bUgPi" role="2Oq$k0">
-                      <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                      <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                     </node>
                     <node concept="liA8E" id="1ffsG7bUgPj" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Class.getPackage():java.lang.Package" resolve="getPackage" />
+                      <ref role="37wK5l" to="wyt6:~Class.getPackage()" resolve="getPackage" />
                     </node>
                   </node>
                   <node concept="liA8E" id="1ffsG7bUgPk" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Package.getName():java.lang.String" resolve="getName" />
+                    <ref role="37wK5l" to="wyt6:~Package.getName()" resolve="getName" />
                   </node>
                 </node>
               </node>
@@ -1409,9 +1409,9 @@
         <node concept="3clFbF" id="5uFPQ7BZvJl" role="3cqZAp">
           <node concept="2YIFZM" id="5uFPQ7BZvJm" role="3clFbG">
             <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
-            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
+            <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
             <node concept="2YIFZM" id="5uFPQ7BZvJn" role="37wK5m">
-              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...):java.util.List" resolve="asList" />
+              <ref role="37wK5l" to="33ny:~Arrays.asList(java.lang.Object...)" resolve="asList" />
               <ref role="1Pybhc" to="33ny:~Arrays" resolve="Arrays" />
               <node concept="37vLTw" id="5uFPQ7BZvJo" role="37wK5m">
                 <ref role="3cqZAo" node="5uFPQ7BZuef" resolve="arguments" />
@@ -1475,7 +1475,7 @@
                       <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
                     </node>
                     <node concept="liA8E" id="7HUwyZbi4hh" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                       <node concept="2OqwBi" id="7HUwyZbi4Af" role="37wK5m">
                         <node concept="1eOMI4" id="7HUwyZbi4o9" role="2Oq$k0">
                           <node concept="10QFUN" id="7HUwyZbi4o6" role="1eOMHV">
@@ -1488,7 +1488,7 @@
                           </node>
                         </node>
                         <node concept="liA8E" id="7HUwyZbi4HE" role="2OqNvi">
-                          <ref role="37wK5l" to="bj13:~MetaLogical.type():java.lang.Class" resolve="type" />
+                          <ref role="37wK5l" to="bj13:~MetaLogical.type()" resolve="type" />
                         </node>
                       </node>
                     </node>
@@ -1525,7 +1525,7 @@
                         <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
                       </node>
                       <node concept="liA8E" id="4sSe4$prIpP" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                         <node concept="3VsKOn" id="4sSe4$prJvo" role="37wK5m">
                           <ref role="3VsUkX" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
                         </node>
@@ -1543,13 +1543,13 @@
                         <ref role="3cqZAo" node="78CwJJcO$LZ" resolve="types" />
                       </node>
                       <node concept="liA8E" id="78CwJJcO_AW" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                        <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                         <node concept="2OqwBi" id="78CwJJcO_HO" role="37wK5m">
                           <node concept="37vLTw" id="78CwJJcO_G3" role="2Oq$k0">
                             <ref role="3cqZAo" node="78CwJJcO_55" resolve="arg" />
                           </node>
                           <node concept="liA8E" id="78CwJJcO_ND" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                            <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                           </node>
                         </node>
                       </node>
@@ -1653,7 +1653,7 @@
                       <ref role="3cqZAo" node="4sSe4$p01mQ" resolve="res" />
                     </node>
                     <node concept="liA8E" id="4sSe4$p0iRE" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                      <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                       <node concept="2ShNRf" id="4sSe4$p0jEu" role="37wK5m">
                         <node concept="1pGfFk" id="4sSe4$p0lnr" role="2ShVmc">
                           <ref role="37wK5l" to="cxk7:4xBopTzmopz" resolve="UnificationPredicate" />
@@ -2674,7 +2674,7 @@
               <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
             </node>
             <node concept="liA8E" id="32fHqDf93HR" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+              <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
               <node concept="2ShNRf" id="32fHqDf93HS" role="37wK5m">
                 <node concept="1pGfFk" id="32fHqDf93HT" role="2ShVmc">
                   <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
@@ -2718,7 +2718,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
                 </node>
                 <node concept="liA8E" id="2_NfR5wkwVz" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                   <node concept="2ShNRf" id="2_NfR5wkx09" role="37wK5m">
                     <node concept="1pGfFk" id="2_NfR5wkxkq" role="2ShVmc">
                       <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
@@ -2739,7 +2739,7 @@
               <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
             </node>
             <node concept="liA8E" id="2_NfR5wktC6" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+              <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
             </node>
           </node>
         </node>
@@ -2758,7 +2758,7 @@
                 <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
               </node>
               <node concept="liA8E" id="2_NfR5wkyON" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                 <node concept="3cpWsd" id="2_NfR5wkyOO" role="37wK5m">
                   <node concept="3cmrfG" id="2_NfR5wkyOP" role="3uHU7w">
                     <property role="3cmrfH" value="1" />
@@ -2768,7 +2768,7 @@
                       <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
                     </node>
                     <node concept="liA8E" id="2_NfR5wkyOS" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                      <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
                     </node>
                   </node>
                 </node>
@@ -2784,7 +2784,7 @@
                   <ref role="3cqZAo" node="2_NfR5wkuUQ" resolve="body" />
                 </node>
                 <node concept="liA8E" id="7eGEHDlc$aG" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                   <node concept="AH0OO" id="7eGEHDlc$aH" role="37wK5m">
                     <node concept="37vLTw" id="7eGEHDlc$aI" role="AHEQo">
                       <ref role="3cqZAo" node="7eGEHDlc$aK" resolve="i" />
@@ -2850,7 +2850,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
                 </node>
                 <node concept="liA8E" id="7eGEHDlc$b9" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                   <node concept="AH0OO" id="7eGEHDlc$ba" role="37wK5m">
                     <node concept="37vLTw" id="7eGEHDlc$bb" role="AHEQo">
                       <ref role="3cqZAo" node="7eGEHDlc$bd" resolve="i" />
@@ -2908,7 +2908,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
                 </node>
                 <node concept="liA8E" id="7eGEHDlc$bz" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                   <node concept="AH0OO" id="7eGEHDlc$b$" role="37wK5m">
                     <node concept="37vLTw" id="7eGEHDlc$b_" role="AHEQo">
                       <ref role="3cqZAo" node="7eGEHDlc$bB" resolve="i" />
@@ -2974,7 +2974,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
                 </node>
                 <node concept="liA8E" id="7eGEHDlc$c0" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                   <node concept="AH0OO" id="7eGEHDlc$c1" role="37wK5m">
                     <node concept="37vLTw" id="7eGEHDlc$c2" role="AHEQo">
                       <ref role="3cqZAo" node="7eGEHDlc$c4" resolve="i" />
@@ -3039,7 +3039,7 @@
                     <ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
                   </node>
                   <node concept="liA8E" id="7nkyKX7mhwW" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                    <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
                   </node>
                 </node>
                 <node concept="2OqwBi" id="7nkyKX7mh4U" role="3uHU7B">
@@ -3047,7 +3047,7 @@
                     <ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
                   </node>
                   <node concept="liA8E" id="7nkyKX7mh4W" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                    <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
                   </node>
                 </node>
               </node>
@@ -3069,7 +3069,7 @@
                 <ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
               </node>
               <node concept="liA8E" id="7nkyKX7mnTd" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
               </node>
             </node>
           </node>
@@ -3089,7 +3089,7 @@
                 <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
               </node>
               <node concept="liA8E" id="7nkyKX7mnWy" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
               </node>
             </node>
           </node>
@@ -3210,7 +3210,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
                 </node>
                 <node concept="liA8E" id="7eGEHDlc$c_" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                  <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
                 </node>
               </node>
             </node>
@@ -3220,7 +3220,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
                 </node>
                 <node concept="liA8E" id="7eGEHDlc$cD" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                  <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
                 </node>
               </node>
             </node>
@@ -3246,7 +3246,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
                 </node>
                 <node concept="liA8E" id="7eGEHDlc$cN" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                  <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
                 </node>
               </node>
             </node>
@@ -3258,7 +3258,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
                 </node>
                 <node concept="liA8E" id="7eGEHDlc$cS" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                  <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
                 </node>
               </node>
             </node>
@@ -3321,7 +3321,7 @@
               <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
             </node>
             <node concept="liA8E" id="7eGEHDlc$dd" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+              <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
             </node>
           </node>
         </node>
@@ -3329,7 +3329,7 @@
         <node concept="3clFbF" id="7eGEHDlc$df" role="3cqZAp">
           <node concept="37vLTI" id="7eGEHDlc$dg" role="3clFbG">
             <node concept="2YIFZM" id="7eGEHDlc$dh" role="37vLTx">
-              <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
+              <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
               <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
               <node concept="37vLTw" id="7eGEHDlc$di" role="37wK5m">
                 <ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
@@ -3343,7 +3343,7 @@
         <node concept="3clFbF" id="7eGEHDlc$dk" role="3cqZAp">
           <node concept="37vLTI" id="7eGEHDlc$dl" role="3clFbG">
             <node concept="2YIFZM" id="7eGEHDlc$dm" role="37vLTx">
-              <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
+              <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
               <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
               <node concept="37vLTw" id="7eGEHDlc$dn" role="37wK5m">
                 <ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
@@ -3357,7 +3357,7 @@
         <node concept="3clFbF" id="7eGEHDlc$dp" role="3cqZAp">
           <node concept="37vLTI" id="7eGEHDlc$dq" role="3clFbG">
             <node concept="2YIFZM" id="7eGEHDlc$dr" role="37vLTx">
-              <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
+              <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
               <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
               <node concept="37vLTw" id="7eGEHDlc$ds" role="37wK5m">
                 <ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
@@ -3371,7 +3371,7 @@
         <node concept="3clFbF" id="7eGEHDlc$du" role="3cqZAp">
           <node concept="37vLTI" id="7eGEHDlc$dv" role="3clFbG">
             <node concept="2YIFZM" id="7eGEHDlc$dw" role="37vLTx">
-              <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List):java.util.List" resolve="unmodifiableList" />
+              <ref role="37wK5l" to="33ny:~Collections.unmodifiableList(java.util.List)" resolve="unmodifiableList" />
               <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
               <node concept="37vLTw" id="7eGEHDlc$dx" role="37wK5m">
                 <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
@@ -3411,7 +3411,7 @@
         <node concept="3clFbF" id="3KXGt7WsboW" role="3cqZAp">
           <node concept="2YIFZM" id="3KXGt7Wsbqk" role="3clFbG">
             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-            <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+            <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
             <node concept="Xl_RD" id="3KXGt7WsbrR" role="37wK5m">
               <property role="Xl_RC" value="%s (%d,%d,%d,%d)" />
             </node>
@@ -3423,7 +3423,7 @@
                 <ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
               </node>
               <node concept="liA8E" id="3KXGt7Wscd_" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
               </node>
             </node>
             <node concept="2OqwBi" id="3KXGt7WsczF" role="37wK5m">
@@ -3431,7 +3431,7 @@
                 <ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
               </node>
               <node concept="liA8E" id="3KXGt7WscRr" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
               </node>
             </node>
             <node concept="2OqwBi" id="3KXGt7WsdgT" role="37wK5m">
@@ -3439,7 +3439,7 @@
                 <ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
               </node>
               <node concept="liA8E" id="3KXGt7WsdAI" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
               </node>
             </node>
             <node concept="2OqwBi" id="3KXGt7Wse6B" role="37wK5m">
@@ -3447,7 +3447,7 @@
                 <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
               </node>
               <node concept="liA8E" id="3KXGt7WseOV" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
               </node>
             </node>
           </node>
@@ -3507,7 +3507,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
                 </node>
                 <node concept="liA8E" id="2$F5QpusUuh" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
+                  <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
                   <node concept="2OqwBi" id="2$F5QpusUui" role="37wK5m">
                     <node concept="37vLTw" id="2$F5QpusUuj" role="2Oq$k0">
                       <ref role="3cqZAo" node="2$F5QpusUu8" resolve="toMerge" />
@@ -3525,7 +3525,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
                 </node>
                 <node concept="liA8E" id="2$F5QpusUuo" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
+                  <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
                   <node concept="2OqwBi" id="2$F5QpusUup" role="37wK5m">
                     <node concept="37vLTw" id="2$F5QpusUuq" role="2Oq$k0">
                       <ref role="3cqZAo" node="2$F5QpusUu8" resolve="toMerge" />
@@ -3543,7 +3543,7 @@
                   <ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
                 </node>
                 <node concept="liA8E" id="2$F5QpusUuv" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
+                  <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
                   <node concept="2OqwBi" id="2$F5QpusUuw" role="37wK5m">
                     <node concept="37vLTw" id="2$F5QpusUux" role="2Oq$k0">
                       <ref role="3cqZAo" node="2$F5QpusUu8" resolve="toMerge" />
@@ -3593,7 +3593,7 @@
                           <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
                         </node>
                         <node concept="liA8E" id="2_NfR5wocuG" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                          <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                           <node concept="2ShNRf" id="2_NfR5wocuH" role="37wK5m">
                             <node concept="1pGfFk" id="2_NfR5wocuI" role="2ShVmc">
                               <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
@@ -3622,7 +3622,7 @@
                           <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
                         </node>
                         <node concept="liA8E" id="2_NfR5wocv0" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                          <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
                         </node>
                       </node>
                     </node>
@@ -3635,7 +3635,7 @@
                         <ref role="3cqZAo" node="7eGEHDlc$eX" resolve="bodyAlternation" />
                       </node>
                       <node concept="liA8E" id="2_NfR5wnLkp" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                        <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                         <node concept="3cpWs3" id="2_NfR5wobVk" role="37wK5m">
                           <node concept="37vLTw" id="2_NfR5woc7d" role="3uHU7w">
                             <ref role="3cqZAo" node="2_NfR5woa4k" resolve="intoAlt" />
@@ -3647,13 +3647,13 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="2_NfR5wnLF3" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
+                      <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
                       <node concept="2OqwBi" id="2_NfR5wnLVl" role="37wK5m">
                         <node concept="37vLTw" id="2_NfR5wnLLI" role="2Oq$k0">
                           <ref role="3cqZAo" node="2_NfR5wnF33" resolve="bodyToMerge" />
                         </node>
                         <node concept="liA8E" id="2_NfR5wnM5M" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                          <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                           <node concept="37vLTw" id="2_NfR5wnMd2" role="37wK5m">
                             <ref role="3cqZAo" node="2_NfR5wnGml" resolve="j" />
                           </node>
@@ -3676,7 +3676,7 @@
                     <ref role="3cqZAo" node="2_NfR5wnF33" resolve="bodyToMerge" />
                   </node>
                   <node concept="liA8E" id="2_NfR5wnH6B" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                    <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
                   </node>
                 </node>
                 <node concept="37vLTw" id="2_NfR5wnWcT" role="3uHU7B">
@@ -3950,7 +3950,7 @@
                 <ref role="3cqZAo" node="4cvjh$8B862" resolve="result" />
               </node>
               <node concept="liA8E" id="4cvjh$8BctK" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection):boolean" resolve="addAll" />
+                <ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection)" resolve="addAll" />
                 <node concept="37vLTw" id="4cvjh$8BcBX" role="37wK5m">
                   <ref role="3cqZAo" node="7eGEHDlc$e_" resolve="headKept" />
                 </node>
@@ -3963,7 +3963,7 @@
                 <ref role="3cqZAo" node="4cvjh$8B862" resolve="result" />
               </node>
               <node concept="liA8E" id="4cvjh$8BcUx" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection):boolean" resolve="addAll" />
+                <ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection)" resolve="addAll" />
                 <node concept="37vLTw" id="4cvjh$8BdMl" role="37wK5m">
                   <ref role="3cqZAo" node="7eGEHDlc$eH" resolve="headReplaced" />
                 </node>
@@ -3976,7 +3976,7 @@
                 <ref role="3cqZAo" node="4cvjh$8B862" resolve="result" />
               </node>
               <node concept="liA8E" id="4cvjh$8Be8c" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection):boolean" resolve="addAll" />
+                <ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection)" resolve="addAll" />
                 <node concept="37vLTw" id="4cvjh$8Bf3k" role="37wK5m">
                   <ref role="3cqZAo" node="7eGEHDlc$eP" resolve="guard" />
                 </node>
@@ -3991,7 +3991,7 @@
                     <ref role="3cqZAo" node="4cvjh$8B862" resolve="result" />
                   </node>
                   <node concept="liA8E" id="2_NfR5wkFnv" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection):boolean" resolve="addAll" />
+                    <ref role="37wK5l" to="33ny:~ArrayList.addAll(java.util.Collection)" resolve="addAll" />
                     <node concept="37vLTw" id="2_NfR5wm6m8" role="37wK5m">
                       <ref role="3cqZAo" node="2_NfR5wkFnx" resolve="list" />
                     </node>
diff --git a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd
index d6ee483f..82623697 100644
--- a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/jetbrains.mps.lang.controlflow.runtime.msd
@@ -19,7 +19,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
index c463314f..3324a227 100644
--- a/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.controlflow.runtime/models/jetbrains.mps.lang.controlflow.aspect.mps
@@ -2,7 +2,7 @@
 <model ref="r:bf5143f7-9856-43e8-8ae7-57cecc1fe6a9(jetbrains.mps.lang.controlflow.aspect)">
   <persistence version="9" />
   <languages>
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
index 53ac75ae..d2e660fa 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/jetbrains.mps.lang.typechecking.runtime.msd
@@ -17,7 +17,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
index 74024b42..517473a9 100644
--- a/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
+++ b/coderules/solutions/jetbrains.mps.lang.typechecking.runtime/models/jetbrains.mps.lang.typechecking.aspect.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
   </languages>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
index ee7d52b0..05e1fc26 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
+++ b/coderules/solutions/jetbrains.mps.logic.test/jetbrains.mps.logic.test.msd
@@ -29,14 +29,16 @@
     <language slang="l:f61473f9-130f-42f6-b98d-6c438812c2f6:jetbrains.mps.baseLanguage.unitTest" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
   </languageVersions>
   <dependencyVersions>
+    <module reference="1fd846c3-c5f9-4b9e-9ecc-e716f7149f86(Hamcrest)" version="0" />
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
+    <module reference="49808fad-9d41-4b96-83fa-9231640f6b2b(JUnit)" version="0" />
     <module reference="bbf5c548-7111-4a53-a117-cdefc664cf34(jetbrains.mps.logic.reactor)" version="0" />
     <module reference="a5478664-6b44-4c62-a9f7-434f8aa57eee(jetbrains.mps.logic.runtime)" version="0" />
     <module reference="b189d6c6-9397-4d64-88af-1ac73760a4f5(jetbrains.mps.logic.test)" version="0" />
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
index f02cb457..3d6a85d6 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/logical@tests.mps
@@ -234,7 +234,7 @@
             </node>
             <node concept="2YIFZM" id="2ev$9JFEJ9d" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-              <ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
+              <ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
             </node>
           </node>
         </node>
@@ -264,7 +264,7 @@
             </node>
             <node concept="2YIFZM" id="6MYr6JxszWa" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-              <ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
+              <ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
             </node>
           </node>
         </node>
@@ -288,7 +288,7 @@
             </node>
             <node concept="2YIFZM" id="2ev$9JFEGHr" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-              <ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
+              <ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
             </node>
           </node>
         </node>
@@ -309,7 +309,7 @@
             </node>
             <node concept="2YIFZM" id="6YPNC4Oxbib" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-              <ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
+              <ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
             </node>
           </node>
         </node>
@@ -330,7 +330,7 @@
             </node>
             <node concept="2YIFZM" id="6YPNC4P9XGv" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-              <ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
+              <ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
             </node>
           </node>
         </node>
@@ -351,7 +351,7 @@
             </node>
             <node concept="2YIFZM" id="2ev$9JFEHVa" role="10QFUP">
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-              <ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
+              <ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
             </node>
           </node>
         </node>
@@ -375,7 +375,7 @@
               </node>
             </node>
             <node concept="2YIFZM" id="2ev$9JFF1GZ" role="10QFUP">
-              <ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
+              <ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
             </node>
           </node>
@@ -398,7 +398,7 @@
         <node concept="3clFbF" id="5YVX0wIlg0e" role="3cqZAp">
           <node concept="10QFUN" id="5YVX0wIlg0f" role="3clFbG">
             <node concept="2YIFZM" id="5YVX0wIlg0i" role="10QFUP">
-              <ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
+              <ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
             </node>
             <node concept="3uibUv" id="5YVX0wIlhe5" role="10QFUM">
@@ -431,7 +431,7 @@
               </node>
             </node>
             <node concept="2YIFZM" id="2ev$9JFF1T1" role="10QFUP">
-              <ref role="37wK5l" to="n4y8:~Matchers.anyObject():java.lang.Object" resolve="anyObject" />
+              <ref role="37wK5l" to="n4y8:~Matchers.anyObject()" resolve="anyObject" />
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
             </node>
           </node>
@@ -458,7 +458,7 @@
               <ref role="16sUi3" node="6MYr6Jxs5Fh" resolve="T" />
             </node>
             <node concept="2YIFZM" id="2ev$9JFFamJ" role="10QFUP">
-              <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
+              <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
               <node concept="37vLTw" id="2ev$9JFFa$M" role="37wK5m">
                 <ref role="3cqZAo" node="2ev$9JFF9OQ" resolve="root" />
@@ -494,7 +494,7 @@
               <ref role="3uigEE" to="6exd:3OPtF03lco4" resolve="ListNode" />
             </node>
             <node concept="2YIFZM" id="5YVX0wIlmGB" role="10QFUP">
-              <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
+              <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
               <node concept="37vLTw" id="5YVX0wIlmGC" role="37wK5m">
                 <ref role="3cqZAo" node="5YVX0wIlmGv" resolve="root" />
@@ -530,7 +530,7 @@
               </node>
             </node>
             <node concept="2YIFZM" id="2ev$9JFFaOH" role="10QFUP">
-              <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
+              <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
               <node concept="37vLTw" id="2ev$9JFFaOI" role="37wK5m">
                 <ref role="3cqZAo" node="2ev$9JFFaOy" resolve="root" />
@@ -569,7 +569,7 @@
                 <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="2ev$9JFBNlT" role="33vP2m">
-                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
+                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="2ev$9JFBNlU" role="37wK5m">
                   <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@@ -580,7 +580,7 @@
           <node concept="3clFbF" id="2ev$9JFD$a0" role="3cqZAp">
             <node concept="2OqwBi" id="2ev$9JFD_sZ" role="3clFbG">
               <node concept="2YIFZM" id="2ev$9JFD$gY" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="2ev$9JFD_cy" role="37wK5m">
                   <node concept="37vLTw" id="2ev$9JFD$lP" role="2Oq$k0">
@@ -595,7 +595,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFDA_w" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="2ev$9JFDAMR" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAO" resolve="STOP" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -627,7 +627,7 @@
             <node concept="2OqwBi" id="2ev$9JFD8AJ" role="3clFbG">
               <node concept="2YIFZM" id="2ev$9JFCUun" role="2Oq$k0">
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                 <node concept="37vLTw" id="2ev$9JFCU_6" role="37wK5m">
                   <ref role="3cqZAo" node="2ev$9JFBNlS" resolve="mock" />
                 </node>
@@ -639,7 +639,7 @@
                     <ref role="3uigEE" to="6exd:5JQSuNswOXL" resolve="TermNode" />
                   </node>
                   <node concept="2YIFZM" id="2ev$9JFDJDP" role="10QFUP">
-                    <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object):java.lang.Object" resolve="eq" />
+                    <ref role="37wK5l" to="n4y8:~Matchers.eq(java.lang.Object)" resolve="eq" />
                     <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                     <node concept="37vLTw" id="2ev$9JFDJDR" role="37wK5m">
                       <ref role="3cqZAo" node="2ev$9JFBKEx" resolve="tf" />
@@ -660,7 +660,7 @@
             <node concept="3clFbF" id="2ev$9JFCMRW" role="8Wnug">
               <node concept="2OqwBi" id="2ev$9JFCN6D" role="3clFbG">
                 <node concept="2YIFZM" id="2ev$9JFCN0S" role="2Oq$k0">
-                  <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                   <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                   <node concept="37vLTw" id="2ev$9JFCN5N" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFBNlS" resolve="mock" />
@@ -732,7 +732,7 @@
                 <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="2ev$9JFDVC8" role="33vP2m">
-                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
+                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="2ev$9JFDVC9" role="37wK5m">
                   <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@@ -743,7 +743,7 @@
           <node concept="3clFbF" id="2ev$9JFE1bK" role="3cqZAp">
             <node concept="2OqwBi" id="2ev$9JFE1bL" role="3clFbG">
               <node concept="2YIFZM" id="2ev$9JFE1bM" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="2ev$9JFE1bN" role="37wK5m">
                   <node concept="37vLTw" id="2ev$9JFE1bO" role="2Oq$k0">
@@ -758,7 +758,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFE1bW" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="2ev$9JFE9Ih" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -769,7 +769,7 @@
           <node concept="3clFbF" id="2ev$9JFDVCa" role="3cqZAp">
             <node concept="2OqwBi" id="2ev$9JFDVCb" role="3clFbG">
               <node concept="2YIFZM" id="2ev$9JFDVCc" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="2ev$9JFDVCd" role="37wK5m">
                   <node concept="37vLTw" id="2ev$9JFDVCe" role="2Oq$k0">
@@ -784,7 +784,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFDVCm" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="2ev$9JFDVCn" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAO" resolve="STOP" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -815,7 +815,7 @@
           <node concept="3clFbF" id="2ev$9JFDVCz" role="3cqZAp">
             <node concept="2OqwBi" id="2ev$9JFDVC$" role="3clFbG">
               <node concept="2YIFZM" id="2ev$9JFDVC_" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="37vLTw" id="2ev$9JFDVCA" role="37wK5m">
                   <ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
@@ -835,7 +835,7 @@
           <node concept="3clFbF" id="2ev$9JFEwbB" role="3cqZAp">
             <node concept="2OqwBi" id="2ev$9JFEwbC" role="3clFbG">
               <node concept="2YIFZM" id="2ev$9JFEwbD" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="37vLTw" id="2ev$9JFEwbE" role="37wK5m">
                   <ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
@@ -860,7 +860,7 @@
           </node>
           <node concept="3clFbF" id="2ev$9JFEqKD" role="3cqZAp">
             <node concept="2YIFZM" id="2ev$9JFEr5j" role="3clFbG">
-              <ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...):void" resolve="verifyNoMoreInteractions" />
+              <ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...)" resolve="verifyNoMoreInteractions" />
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
               <node concept="37vLTw" id="2ev$9JFErhz" role="37wK5m">
                 <ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
@@ -880,7 +880,7 @@
               <node concept="2OqwBi" id="2ev$9JFDVCQ" role="3clFbG">
                 <node concept="2YIFZM" id="2ev$9JFDVCR" role="2Oq$k0">
                   <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                  <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="2ev$9JFDVCS" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFDVC6" resolve="mock" />
                   </node>
@@ -1003,7 +1003,7 @@
                 <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="2ev$9JFFqmH" role="33vP2m">
-                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
+                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="2ev$9JFFqmI" role="37wK5m">
                   <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@@ -1014,7 +1014,7 @@
           <node concept="3clFbF" id="2ev$9JFFqmJ" role="3cqZAp">
             <node concept="2OqwBi" id="2ev$9JFFqmK" role="3clFbG">
               <node concept="2YIFZM" id="2ev$9JFFqmL" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="2ev$9JFFqmM" role="37wK5m">
                   <node concept="37vLTw" id="2ev$9JFFqmN" role="2Oq$k0">
@@ -1029,7 +1029,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFFqmR" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="2ev$9JFFqmS" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -1040,7 +1040,7 @@
           <node concept="3clFbF" id="6YPNC4OxdlG" role="3cqZAp">
             <node concept="2OqwBi" id="6YPNC4OxdlH" role="3clFbG">
               <node concept="2YIFZM" id="6YPNC4OxdlI" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="6YPNC4OxdlJ" role="37wK5m">
                   <node concept="37vLTw" id="6YPNC4OxdlK" role="2Oq$k0">
@@ -1055,7 +1055,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6YPNC4OxdlN" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="6YPNC4OxdlO" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -1066,7 +1066,7 @@
           <node concept="3clFbF" id="2ev$9JFFqmT" role="3cqZAp">
             <node concept="2OqwBi" id="2ev$9JFFqmU" role="3clFbG">
               <node concept="2YIFZM" id="2ev$9JFFqmV" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="2ev$9JFFqmW" role="37wK5m">
                   <node concept="37vLTw" id="2ev$9JFFqmX" role="2Oq$k0">
@@ -1081,7 +1081,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="2ev$9JFFqn1" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="1G9MbtSLhK0" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -1116,7 +1116,7 @@
                 <ref role="3uigEE" to="n4y8:~InOrder" resolve="InOrder" />
               </node>
               <node concept="2YIFZM" id="1G9MbtSL6UA" role="33vP2m">
-                <ref role="37wK5l" to="n4y8:~Mockito.inOrder(java.lang.Object...):org.mockito.InOrder" resolve="inOrder" />
+                <ref role="37wK5l" to="n4y8:~Mockito.inOrder(java.lang.Object...)" resolve="inOrder" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="37vLTw" id="1G9MbtSL6UB" role="37wK5m">
                   <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
@@ -1132,7 +1132,7 @@
                   <ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSMabr" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSMabs" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
                   </node>
@@ -1156,7 +1156,7 @@
                   <ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSL9WN" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSL9WO" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
                   </node>
@@ -1180,7 +1180,7 @@
                   <ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSLa$w" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSLa$x" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
                   </node>
@@ -1204,7 +1204,7 @@
                   <ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSLbui" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSLbuj" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
                   </node>
@@ -1228,13 +1228,13 @@
                   <ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSLmaw" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSLmax" role="37wK5m">
                     <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
                   </node>
                   <node concept="2YIFZM" id="1G9MbtSLmay" role="37wK5m">
                     <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                    <ref role="37wK5l" to="n4y8:~Mockito.times(int):org.mockito.verification.VerificationMode" resolve="times" />
+                    <ref role="37wK5l" to="n4y8:~Mockito.times(int)" resolve="times" />
                     <node concept="3cmrfG" id="1G9MbtSLmaz" role="37wK5m">
                       <property role="3cmrfH" value="3" />
                     </node>
@@ -1253,13 +1253,13 @@
                 <ref role="3cqZAo" node="1G9MbtSL6U_" resolve="inOrder" />
               </node>
               <node concept="liA8E" id="1G9MbtSM9zH" role="2OqNvi">
-                <ref role="37wK5l" to="n4y8:~InOrder.verifyNoMoreInteractions():void" resolve="verifyNoMoreInteractions" />
+                <ref role="37wK5l" to="n4y8:~InOrder.verifyNoMoreInteractions()" resolve="verifyNoMoreInteractions" />
               </node>
             </node>
           </node>
           <node concept="3clFbF" id="1G9MbtSLrav" role="3cqZAp">
             <node concept="2YIFZM" id="1G9MbtSLraw" role="3clFbG">
-              <ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...):void" resolve="verifyNoMoreInteractions" />
+              <ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...)" resolve="verifyNoMoreInteractions" />
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
               <node concept="37vLTw" id="1G9MbtSLrax" role="37wK5m">
                 <ref role="3cqZAo" node="2ev$9JFFqmF" resolve="mock" />
@@ -1305,7 +1305,7 @@
                 <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="6MYr6Jxs3nR" role="33vP2m">
-                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
+                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="6MYr6Jxs3nS" role="37wK5m">
                   <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@@ -1316,7 +1316,7 @@
           <node concept="3clFbF" id="6MYr6Jxs3nT" role="3cqZAp">
             <node concept="2OqwBi" id="6MYr6Jxs3nU" role="3clFbG">
               <node concept="2YIFZM" id="6MYr6Jxs3nV" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="6MYr6Jxs3nW" role="37wK5m">
                   <node concept="37vLTw" id="6MYr6Jxs3nX" role="2Oq$k0">
@@ -1331,7 +1331,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6MYr6Jxs3o0" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="6MYr6Jxs3o1" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -1363,7 +1363,7 @@
             <node concept="2OqwBi" id="6MYr6Jxs3ol" role="3clFbG">
               <node concept="2YIFZM" id="6MYr6Jxs3om" role="2Oq$k0">
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                 <node concept="37vLTw" id="6MYr6Jxs3on" role="37wK5m">
                   <ref role="3cqZAo" node="6MYr6Jxs3nP" resolve="mock" />
                 </node>
@@ -1387,7 +1387,7 @@
           </node>
           <node concept="3clFbF" id="6MYr6Jxs3oN" role="3cqZAp">
             <node concept="2YIFZM" id="6MYr6Jxs3oO" role="3clFbG">
-              <ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...):void" resolve="verifyNoMoreInteractions" />
+              <ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...)" resolve="verifyNoMoreInteractions" />
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
               <node concept="37vLTw" id="6MYr6Jxs3oP" role="37wK5m">
                 <ref role="3cqZAo" node="6MYr6Jxs3nP" resolve="mock" />
@@ -1407,7 +1407,7 @@
               <node concept="2OqwBi" id="6MYr6Jxs3oV" role="3clFbG">
                 <node concept="2YIFZM" id="6MYr6Jxs3oW" role="2Oq$k0">
                   <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                  <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="6MYr6Jxs3oX" role="37wK5m">
                     <ref role="3cqZAo" node="6MYr6Jxs3nP" resolve="mock" />
                   </node>
@@ -1617,7 +1617,7 @@
                 <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="5YVX0wIjRT6" role="33vP2m">
-                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
+                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="5YVX0wIjRT7" role="37wK5m">
                   <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@@ -1628,7 +1628,7 @@
           <node concept="3clFbF" id="5YVX0wIjRT8" role="3cqZAp">
             <node concept="2OqwBi" id="5YVX0wIjRT9" role="3clFbG">
               <node concept="2YIFZM" id="5YVX0wIjRTa" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="5YVX0wIjRTb" role="37wK5m">
                   <node concept="37vLTw" id="5YVX0wIjRTc" role="2Oq$k0">
@@ -1643,7 +1643,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5YVX0wIjRTg" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="5YVX0wIjRTh" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -1654,7 +1654,7 @@
           <node concept="3clFbF" id="6YPNC4OxmIB" role="3cqZAp">
             <node concept="2OqwBi" id="6YPNC4OxmIC" role="3clFbG">
               <node concept="2YIFZM" id="6YPNC4OxmID" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="6YPNC4OxmIE" role="37wK5m">
                   <node concept="37vLTw" id="6YPNC4OxmIF" role="2Oq$k0">
@@ -1669,7 +1669,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6YPNC4OxmII" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="6YPNC4OxmIJ" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -1680,7 +1680,7 @@
           <node concept="3clFbF" id="6YPNC4Pa4ha" role="3cqZAp">
             <node concept="2OqwBi" id="6YPNC4Pa4hb" role="3clFbG">
               <node concept="2YIFZM" id="6YPNC4Pa4hc" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="6YPNC4Pa4hd" role="37wK5m">
                   <node concept="37vLTw" id="6YPNC4Pa4he" role="2Oq$k0">
@@ -1695,7 +1695,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6YPNC4Pa4hh" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="6YPNC4Pa4hi" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -1706,7 +1706,7 @@
           <node concept="3clFbF" id="5YVX0wIleMN" role="3cqZAp">
             <node concept="2OqwBi" id="5YVX0wIleMO" role="3clFbG">
               <node concept="2YIFZM" id="5YVX0wIleMP" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="5YVX0wIleMQ" role="37wK5m">
                   <node concept="37vLTw" id="5YVX0wIleMR" role="2Oq$k0">
@@ -1721,7 +1721,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5YVX0wIleMV" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="5YVX0wIleMW" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -1732,7 +1732,7 @@
           <node concept="3clFbF" id="5YVX0wIlkDU" role="3cqZAp">
             <node concept="2OqwBi" id="5YVX0wIlkDV" role="3clFbG">
               <node concept="2YIFZM" id="5YVX0wIlkDW" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="5YVX0wIlkDX" role="37wK5m">
                   <node concept="37vLTw" id="5YVX0wIlkDY" role="2Oq$k0">
@@ -1747,7 +1747,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="5YVX0wIlkE2" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="5YVX0wIlkVS" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -1779,7 +1779,7 @@
             <node concept="2OqwBi" id="5YVX0wIjRTA" role="3clFbG">
               <node concept="2YIFZM" id="5YVX0wIjRTB" role="2Oq$k0">
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                 <node concept="37vLTw" id="5YVX0wIjRTC" role="37wK5m">
                   <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
                 </node>
@@ -1799,7 +1799,7 @@
             <node concept="2OqwBi" id="5YVX0wIjRTI" role="3clFbG">
               <node concept="2YIFZM" id="5YVX0wIjRTJ" role="2Oq$k0">
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                 <node concept="37vLTw" id="5YVX0wIjRTK" role="37wK5m">
                   <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
                 </node>
@@ -1819,7 +1819,7 @@
             <node concept="2OqwBi" id="5YVX0wIjRTQ" role="3clFbG">
               <node concept="2YIFZM" id="5YVX0wIjRTR" role="2Oq$k0">
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                 <node concept="37vLTw" id="5YVX0wIjRTS" role="37wK5m">
                   <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
                 </node>
@@ -1839,7 +1839,7 @@
             <node concept="2OqwBi" id="5YVX0wIlmmy" role="3clFbG">
               <node concept="2YIFZM" id="5YVX0wIlmmz" role="2Oq$k0">
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                 <node concept="37vLTw" id="5YVX0wIlmm$" role="37wK5m">
                   <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
                 </node>
@@ -1866,7 +1866,7 @@
             <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
             <node concept="3clFbF" id="5YVX0wIjRU8" role="8Wnug">
               <node concept="2YIFZM" id="5YVX0wIjRU9" role="3clFbG">
-                <ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...):void" resolve="verifyNoMoreInteractions" />
+                <ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...)" resolve="verifyNoMoreInteractions" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="37vLTw" id="5YVX0wIjRUa" role="37wK5m">
                   <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
@@ -1887,7 +1887,7 @@
               <node concept="2OqwBi" id="5YVX0wIjRUg" role="3clFbG">
                 <node concept="2YIFZM" id="5YVX0wIjRUh" role="2Oq$k0">
                   <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                  <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~Mockito.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="5YVX0wIjRUi" role="37wK5m">
                     <ref role="3cqZAo" node="5YVX0wIjRT4" resolve="mock" />
                   </node>
@@ -2054,7 +2054,7 @@
                 <ref role="3uigEE" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
               </node>
               <node concept="2YIFZM" id="3t7_2Fg_0Jp" role="33vP2m">
-                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class):java.lang.Object" resolve="mock" />
+                <ref role="37wK5l" to="n4y8:~Mockito.mock(java.lang.Class)" resolve="mock" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="3VsKOn" id="3t7_2Fg_0Jq" role="37wK5m">
                   <ref role="3VsUkX" to="6exd:3JgCwkqiP3h" resolve="DataFormWalk.Walker" />
@@ -2067,7 +2067,7 @@
             <node concept="2OqwBi" id="3t7_2Fg_0Js" role="3clFbG">
               <node concept="2YIFZM" id="3t7_2Fg_0Jt" role="2Oq$k0">
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <node concept="2OqwBi" id="3t7_2Fg_0Ju" role="37wK5m">
                   <node concept="37vLTw" id="3t7_2Fg_0Jv" role="2Oq$k0">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
@@ -2081,7 +2081,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3t7_2Fg_0Jy" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="3t7_2Fg_0Jz" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -2093,7 +2093,7 @@
             <node concept="2OqwBi" id="6YPNC4OxszY" role="3clFbG">
               <node concept="2YIFZM" id="6YPNC4OxszZ" role="2Oq$k0">
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <node concept="2OqwBi" id="6YPNC4Oxs$0" role="37wK5m">
                   <node concept="37vLTw" id="6YPNC4Oxs$1" role="2Oq$k0">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
@@ -2107,7 +2107,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6YPNC4Oxs$4" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="6YPNC4Oxs$5" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -2118,7 +2118,7 @@
           <node concept="3clFbF" id="3t7_2Fg_0J$" role="3cqZAp">
             <node concept="2OqwBi" id="3t7_2Fg_0J_" role="3clFbG">
               <node concept="2YIFZM" id="3t7_2Fg_0JA" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="3t7_2Fg_0JB" role="37wK5m">
                   <node concept="37vLTw" id="3t7_2Fg_0JC" role="2Oq$k0">
@@ -2133,7 +2133,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3t7_2Fg_0JF" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="3t7_2Fg_0JG" role="37wK5m">
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAM" resolve="WALK" />
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
@@ -2144,7 +2144,7 @@
           <node concept="3clFbF" id="3t7_2Fg_0JH" role="3cqZAp">
             <node concept="2OqwBi" id="3t7_2Fg_0JI" role="3clFbG">
               <node concept="2YIFZM" id="3t7_2Fg_0JJ" role="2Oq$k0">
-                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="when" />
+                <ref role="37wK5l" to="n4y8:~Mockito.when(java.lang.Object)" resolve="when" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="2OqwBi" id="3t7_2Fg_0JK" role="37wK5m">
                   <node concept="37vLTw" id="3t7_2Fg_0JL" role="2Oq$k0">
@@ -2159,7 +2159,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3t7_2Fg_0JO" role="2OqNvi">
-                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object):org.mockito.stubbing.OngoingStubbing" resolve="thenReturn" />
+                <ref role="37wK5l" to="98:~OngoingStubbing.thenReturn(java.lang.Object)" resolve="thenReturn" />
                 <node concept="Rm8GO" id="3t7_2Fg_0JP" role="37wK5m">
                   <ref role="1Px2BO" to="6exd:2q_78a95hAL" resolve="Action" />
                   <ref role="Rm8GQ" to="6exd:2q_78a95hAN" resolve="CONTINUE" />
@@ -2194,7 +2194,7 @@
                 <ref role="3uigEE" to="n4y8:~InOrder" resolve="InOrder" />
               </node>
               <node concept="2YIFZM" id="1G9MbtSKk2K" role="33vP2m">
-                <ref role="37wK5l" to="n4y8:~Mockito.inOrder(java.lang.Object...):org.mockito.InOrder" resolve="inOrder" />
+                <ref role="37wK5l" to="n4y8:~Mockito.inOrder(java.lang.Object...)" resolve="inOrder" />
                 <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                 <node concept="37vLTw" id="1G9MbtSKk2L" role="37wK5m">
                   <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
@@ -2210,7 +2210,7 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSKoCf" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSKoCg" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
@@ -2236,7 +2236,7 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSLIOx" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSLIOy" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
@@ -2260,7 +2260,7 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSKloO" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSKlw2" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
@@ -2284,12 +2284,12 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSK_GN" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSK_GO" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
                   <node concept="2YIFZM" id="1G9MbtSKK2F" role="37wK5m">
-                    <ref role="37wK5l" to="n4y8:~Mockito.times(int):org.mockito.verification.VerificationMode" resolve="times" />
+                    <ref role="37wK5l" to="n4y8:~Mockito.times(int)" resolve="times" />
                     <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                     <node concept="3cmrfG" id="1G9MbtSKKil" role="37wK5m">
                       <property role="3cmrfH" value="2" />
@@ -2312,7 +2312,7 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSLP6e" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSLP6f" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
@@ -2330,7 +2330,7 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSKmNs" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSKmNt" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
@@ -2354,12 +2354,12 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSKNjU" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSKNjV" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
                   <node concept="2YIFZM" id="1G9MbtSKNjW" role="37wK5m">
-                    <ref role="37wK5l" to="n4y8:~Mockito.times(int):org.mockito.verification.VerificationMode" resolve="times" />
+                    <ref role="37wK5l" to="n4y8:~Mockito.times(int)" resolve="times" />
                     <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                     <node concept="3cmrfG" id="1G9MbtSKNjX" role="37wK5m">
                       <property role="3cmrfH" value="2" />
@@ -2382,7 +2382,7 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSLRxd" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSLRxe" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
@@ -2400,7 +2400,7 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSKnET" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSKnEU" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
@@ -2424,12 +2424,12 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSKPZ3" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSKPZ4" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
                   <node concept="2YIFZM" id="1G9MbtSKPZ5" role="37wK5m">
-                    <ref role="37wK5l" to="n4y8:~Mockito.times(int):org.mockito.verification.VerificationMode" resolve="times" />
+                    <ref role="37wK5l" to="n4y8:~Mockito.times(int)" resolve="times" />
                     <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
                     <node concept="3cmrfG" id="1G9MbtSKPZ6" role="37wK5m">
                       <property role="3cmrfH" value="2" />
@@ -2452,13 +2452,13 @@
                   <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
                 </node>
                 <node concept="liA8E" id="1G9MbtSKXZk" role="2OqNvi">
-                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode):java.lang.Object" resolve="verify" />
+                  <ref role="37wK5l" to="n4y8:~InOrder.verify(java.lang.Object,org.mockito.verification.VerificationMode)" resolve="verify" />
                   <node concept="37vLTw" id="1G9MbtSKXZl" role="37wK5m">
                     <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
                   </node>
                   <node concept="2YIFZM" id="1G9MbtSL2lD" role="37wK5m">
                     <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
-                    <ref role="37wK5l" to="n4y8:~Mockito.times(int):org.mockito.verification.VerificationMode" resolve="times" />
+                    <ref role="37wK5l" to="n4y8:~Mockito.times(int)" resolve="times" />
                     <node concept="3cmrfG" id="1G9MbtSL2lE" role="37wK5m">
                       <property role="3cmrfH" value="3" />
                     </node>
@@ -2477,13 +2477,13 @@
                 <ref role="3cqZAo" node="1G9MbtSKk2J" resolve="inOrder" />
               </node>
               <node concept="liA8E" id="1G9MbtSL$jS" role="2OqNvi">
-                <ref role="37wK5l" to="n4y8:~InOrder.verifyNoMoreInteractions():void" resolve="verifyNoMoreInteractions" />
+                <ref role="37wK5l" to="n4y8:~InOrder.verifyNoMoreInteractions()" resolve="verifyNoMoreInteractions" />
               </node>
             </node>
           </node>
           <node concept="3clFbF" id="1G9MbtSLD6S" role="3cqZAp">
             <node concept="2YIFZM" id="1G9MbtSLDZk" role="3clFbG">
-              <ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...):void" resolve="verifyNoMoreInteractions" />
+              <ref role="37wK5l" to="n4y8:~Mockito.verifyNoMoreInteractions(java.lang.Object...)" resolve="verifyNoMoreInteractions" />
               <ref role="1Pybhc" to="n4y8:~Mockito" resolve="Mockito" />
               <node concept="37vLTw" id="1G9MbtSLEfv" role="37wK5m">
                 <ref role="3cqZAo" node="3t7_2Fg_0Jn" resolve="mock" />
@@ -3165,7 +3165,7 @@
                       <ref role="3cqZAo" node="3t7_2FgAvGP" resolve="lists" />
                     </node>
                     <node concept="liA8E" id="3t7_2FgA$9A" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                      <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                       <node concept="3cmrfG" id="3t7_2FgA$g$" role="37wK5m">
                         <property role="3cmrfH" value="0" />
                       </node>
@@ -3201,7 +3201,7 @@
                       <ref role="3cqZAo" node="3t7_2FgAvGP" resolve="lists" />
                     </node>
                     <node concept="liA8E" id="3t7_2FgA$lO" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                      <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                       <node concept="3cmrfG" id="3t7_2FgA$lP" role="37wK5m">
                         <property role="3cmrfH" value="1" />
                       </node>
@@ -3464,7 +3464,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqvLQ" resolve="wildcard" />
               </node>
               <node concept="liA8E" id="5kEUewdxCBF" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
             <node concept="2OqwBi" id="5kEUewdxCDl" role="3tpDZA">
@@ -3472,7 +3472,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqw8M" resolve="anon1" />
               </node>
               <node concept="liA8E" id="5kEUewdxCGe" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
           </node>
@@ -3482,7 +3482,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqw8M" resolve="anon1" />
               </node>
               <node concept="liA8E" id="5kEUewdxCNz" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
             <node concept="2OqwBi" id="5kEUewdxCPd" role="3tpDZA">
@@ -3490,7 +3490,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqzLa" resolve="anon2" />
               </node>
               <node concept="liA8E" id="5kEUewdxCUU" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
           </node>
@@ -3633,7 +3633,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
               </node>
               <node concept="liA8E" id="5kEUewdxFDZ" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
             <node concept="2OqwBi" id="5kEUewdxFFM" role="3tpDZA">
@@ -3641,7 +3641,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqEO9" resolve="b" />
               </node>
               <node concept="liA8E" id="5kEUewdxFMZ" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
           </node>
@@ -3656,7 +3656,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
               </node>
               <node concept="liA8E" id="5kEUewdxTde" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                 <node concept="37vLTw" id="5kEUewdxTee" role="37wK5m">
                   <ref role="3cqZAo" node="2DKqMqOqEO9" resolve="b" />
                 </node>
@@ -3675,7 +3675,7 @@
                   <ref role="3cqZAo" node="2DKqMqOqEO9" resolve="b" />
                 </node>
                 <node concept="liA8E" id="2DKqMqOqTiy" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
+                  <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
                 </node>
               </node>
               <node concept="2OqwBi" id="2DKqMqOqS_Q" role="3uHU7B">
@@ -3683,7 +3683,7 @@
                   <ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
                 </node>
                 <node concept="liA8E" id="2DKqMqOqSKJ" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
+                  <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
                 </node>
               </node>
             </node>
@@ -3695,17 +3695,17 @@
                   <ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
                 </node>
                 <node concept="liA8E" id="5kEUewdxPYk" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                 </node>
               </node>
               <node concept="liA8E" id="2DKqMqOqFDj" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                 <node concept="2OqwBi" id="5kEUewdxQ14" role="37wK5m">
                   <node concept="37vLTw" id="2DKqMqOqFFv" role="2Oq$k0">
                     <ref role="3cqZAo" node="2DKqMqOqFhe" resolve="c" />
                   </node>
                   <node concept="liA8E" id="5kEUewdxQ6z" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                   </node>
                 </node>
               </node>
@@ -3717,7 +3717,7 @@
                 <ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
               </node>
               <node concept="liA8E" id="2DKqMqOqG9u" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                 <node concept="37vLTw" id="5kEUewdxWe8" role="37wK5m">
                   <ref role="3cqZAo" node="5kEUewdxWe5" resolve="x" />
                 </node>
@@ -3731,17 +3731,17 @@
                   <ref role="3cqZAo" node="2DKqMqOqEKK" resolve="a" />
                 </node>
                 <node concept="liA8E" id="5kEUewdxXjx" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                 </node>
               </node>
               <node concept="liA8E" id="5kEUewdxXxg" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                 <node concept="2OqwBi" id="5kEUewdxXAb" role="37wK5m">
                   <node concept="37vLTw" id="5kEUewdxXzF" role="2Oq$k0">
                     <ref role="3cqZAo" node="5kEUewdxWe5" resolve="x" />
                   </node>
                   <node concept="liA8E" id="5kEUewdxXDu" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                    <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                   </node>
                 </node>
               </node>
@@ -3763,7 +3763,7 @@
                 <ref role="3cqZAo" node="5kEUewdxWe5" resolve="x" />
               </node>
               <node concept="liA8E" id="5kEUewdy5kA" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                 <node concept="37vLTw" id="5kEUewdy5lL" role="37wK5m">
                   <ref role="3cqZAo" node="5kEUewdy0lU" resolve="y" />
                 </node>
@@ -4757,7 +4757,7 @@
                 <ref role="3cqZAo" node="kTK1BfwVhs" resolve="list" />
               </node>
               <node concept="liA8E" id="kTK1Bfx1pW" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                 <node concept="Xl_RD" id="kTK1Bfx1BR" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -4770,7 +4770,7 @@
                 <ref role="3cqZAo" node="kTK1BfwVhs" resolve="list" />
               </node>
               <node concept="liA8E" id="kTK1Bfx240" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                 <node concept="Xl_RD" id="kTK1Bfx241" role="37wK5m">
                   <property role="Xl_RC" value="bar" />
                 </node>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
index 67223807..efd162c6 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification.mps
@@ -162,7 +162,7 @@
         <node concept="3clFbF" id="7ISVfSIf2T" role="3cqZAp">
           <node concept="2YIFZM" id="7ISVfSIf4g" role="3clFbG">
             <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-            <ref role="37wK5l" to="w7la:~EvaluationSession.setBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend):void" resolve="setBackend" />
+            <ref role="37wK5l" to="w7la:~EvaluationSession.setBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend)" resolve="setBackend" />
             <node concept="37vLTw" id="5jPBdK_KfE" role="37wK5m">
               <ref role="3cqZAo" node="5jPBdK_KfB" resolve="ourBackend" />
             </node>
@@ -179,7 +179,7 @@
         <node concept="3clFbF" id="5jPBdK_KqF" role="3cqZAp">
           <node concept="2YIFZM" id="5jPBdK_KEq" role="3clFbG">
             <ref role="1Pybhc" to="w7la:~EvaluationSession" resolve="EvaluationSession" />
-            <ref role="37wK5l" to="w7la:~EvaluationSession.clearBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend):void" resolve="clearBackend" />
+            <ref role="37wK5l" to="w7la:~EvaluationSession.clearBackend(jetbrains.mps.logic.reactor.evaluation.EvaluationSession$Backend)" resolve="clearBackend" />
             <node concept="37vLTw" id="5jPBdK_KEr" role="37wK5m">
               <ref role="3cqZAo" node="5jPBdK_KfB" resolve="ourBackend" />
             </node>
diff --git a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
index b4e78ca1..621f2e1f 100644
--- a/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
+++ b/coderules/solutions/jetbrains.mps.logic.test/models/jetbrains/mps/logic/test/unification@tests.mps
@@ -334,7 +334,7 @@
                 <ref role="3cqZAo" node="5TfjU0xmAUC" resolve="x" />
               </node>
               <node concept="liA8E" id="5TfjU0xmGY8" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="5TfjU0xmH22" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -364,7 +364,7 @@
                 <ref role="3cqZAo" node="5TfjU0xmAUI" resolve="y" />
               </node>
               <node concept="liA8E" id="5TfjU0xmLGH" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="5TfjU0xmLLa" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -394,7 +394,7 @@
                 <ref role="3cqZAo" node="5TfjU0xmAUO" resolve="z" />
               </node>
               <node concept="liA8E" id="5TfjU0xmNLi" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="5TfjU0xmNRG" role="37wK5m">
                   <property role="Xl_RC" value="bar" />
                 </node>
@@ -1116,7 +1116,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3gNap3g8MRy" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="3gNap3g8MRS" role="37wK5m">
                   <property role="Xl_RC" value="xyz" />
                 </node>
@@ -2484,7 +2484,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1OShD0IfIGc" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
               </node>
             </node>
             <node concept="2OqwBi" id="1OShD0IfI6R" role="3tpDZB">
@@ -2495,7 +2495,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="1OShD0IfIj2" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -3030,7 +3030,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3gNap3g823B" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
               </node>
             </node>
             <node concept="2OqwBi" id="3gNap3g823C" role="3tpDZB">
@@ -3041,7 +3041,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3gNap3g823F" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -3088,7 +3088,7 @@
                 <ref role="3cqZAo" node="kTK1BfxNEZ" resolve="list" />
               </node>
               <node concept="liA8E" id="kTK1BfxPgH" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                 <node concept="Xl_RD" id="kTK1BfxPuT" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -3101,7 +3101,7 @@
                 <ref role="3cqZAo" node="kTK1BfxNEZ" resolve="list" />
               </node>
               <node concept="liA8E" id="kTK1BfxQ7L" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object):boolean" resolve="add" />
+                <ref role="37wK5l" to="33ny:~ArrayList.add(java.lang.Object)" resolve="add" />
                 <node concept="Xl_RD" id="kTK1BfxQ7M" role="37wK5m">
                   <property role="Xl_RC" value="bar" />
                 </node>
@@ -3249,7 +3249,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="kTK1BfxL5W" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
               </node>
             </node>
             <node concept="2OqwBi" id="kTK1BfxL5X" role="3tpDZB">
@@ -3260,7 +3260,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="kTK1BfxL60" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
               </node>
             </node>
           </node>
@@ -3376,11 +3376,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3HJTsBn466m" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3HJTsBn466n" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
             <node concept="1oi1Uc" id="3eLgHzX3GZl" role="3tpDZB">
@@ -3501,11 +3501,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3gNap3g8enU" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="3gNap3g8enV" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
             <node concept="Xl_RD" id="3gNap3g8eHS" role="3tpDZB">
@@ -3551,7 +3551,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3gNap3g8lCn" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="3gNap3g8lCK" role="37wK5m">
                   <property role="Xl_RC" value="xyz" />
                 </node>
@@ -3801,11 +3801,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="kTK1BfyxPc" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="kTK1BfyxPd" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
             <node concept="1oi1Uc" id="kTK1BfyxPe" role="3tpDZB">
@@ -4008,11 +4008,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="6MYr6Jy8m2W" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot():jetbrains.mps.logic.reactor.logical.MutableLogical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~MutableLogical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="6MYr6Jy8m2X" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
             <node concept="1oi1Uc" id="6MYr6Jy8lXX" role="3tpDZB">
@@ -4189,7 +4189,7 @@
                 <ref role="3cqZAo" node="1OShD0IfO6H" resolve="x" />
               </node>
               <node concept="liA8E" id="3mz2_dYyyKt" role="2OqNvi">
-                <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
               </node>
             </node>
           </node>
@@ -4199,7 +4199,7 @@
                 <ref role="3cqZAo" node="1OShD0IfP49" resolve="y" />
               </node>
               <node concept="liA8E" id="3mz2_dYyyKx" role="2OqNvi">
-                <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
               </node>
             </node>
           </node>
@@ -4210,7 +4210,7 @@
                   <ref role="3cqZAo" node="1OShD0IfP49" resolve="y" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYyyKA" role="2OqNvi">
-                  <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                  <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
                 </node>
               </node>
               <node concept="2OqwBi" id="3mz2_dYyyKB" role="3uHU7B">
@@ -4218,7 +4218,7 @@
                   <ref role="3cqZAo" node="1OShD0IfO6H" resolve="x" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYyyKD" role="2OqNvi">
-                  <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                  <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
                 </node>
               </node>
             </node>
@@ -4268,7 +4268,7 @@
                 <ref role="3cqZAo" node="1OShD0IfO6H" resolve="x" />
               </node>
               <node concept="liA8E" id="3mz2_dYyzcE" role="2OqNvi">
-                <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
               </node>
             </node>
             <node concept="2OqwBi" id="3mz2_dYyzcF" role="3tpDZA">
@@ -4276,7 +4276,7 @@
                 <ref role="3cqZAo" node="1OShD0IfP49" resolve="y" />
               </node>
               <node concept="liA8E" id="3mz2_dYyzcH" role="2OqNvi">
-                <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
               </node>
             </node>
           </node>
@@ -4462,7 +4462,7 @@
                 <ref role="3cqZAo" node="4XqG8ivylRa" resolve="x" />
               </node>
               <node concept="liA8E" id="3mz2_dYylmd" role="2OqNvi">
-                <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
               </node>
             </node>
           </node>
@@ -4472,7 +4472,7 @@
                 <ref role="3cqZAo" node="4XqG8ivylRq" resolve="y" />
               </node>
               <node concept="liA8E" id="3mz2_dYylm_" role="2OqNvi">
-                <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
               </node>
             </node>
           </node>
@@ -4483,7 +4483,7 @@
                   <ref role="3cqZAo" node="4XqG8ivylRq" resolve="y" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYyuoZ" role="2OqNvi">
-                  <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                  <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
                 </node>
               </node>
               <node concept="2OqwBi" id="3mz2_dYyu5J" role="3uHU7B">
@@ -4491,7 +4491,7 @@
                   <ref role="3cqZAo" node="4XqG8ivylRa" resolve="x" />
                 </node>
                 <node concept="liA8E" id="3mz2_dYyudo" role="2OqNvi">
-                  <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                  <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
                 </node>
               </node>
             </node>
@@ -4541,7 +4541,7 @@
                 <ref role="3cqZAo" node="4XqG8ivylRa" resolve="x" />
               </node>
               <node concept="liA8E" id="3mz2_dYym2e" role="2OqNvi">
-                <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
               </node>
             </node>
             <node concept="2OqwBi" id="3mz2_dYymac" role="3tpDZA">
@@ -4549,7 +4549,7 @@
                 <ref role="3cqZAo" node="4XqG8ivylRq" resolve="y" />
               </node>
               <node concept="liA8E" id="3mz2_dYymhu" role="2OqNvi">
-                <ref role="37wK5l" to="yt73:~Term.get():jetbrains.mps.unification.Term" resolve="get" />
+                <ref role="37wK5l" to="yt73:~Term.get()" resolve="get" />
               </node>
             </node>
           </node>
@@ -4731,7 +4731,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVxI_" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -4947,7 +4947,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVtAm" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -4960,7 +4960,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVuqF" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -5177,7 +5177,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVrZL" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -5356,7 +5356,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVqqO" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -5485,7 +5485,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVo6f" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -5649,7 +5649,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVknj" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -5887,7 +5887,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVcT8" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -5916,7 +5916,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="4$OyT8IVdCg" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.isBound():boolean" resolve="isBound" />
+                <ref role="37wK5l" to="bj13:~Logical.isBound()" resolve="isBound" />
               </node>
             </node>
           </node>
@@ -6310,11 +6310,11 @@
                     <ref role="3cqZAo" node="3K_0akS_bIv" resolve="p1" />
                   </node>
                   <node concept="liA8E" id="6HT7BWBPd0X" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6HT7BWBPd0Y" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                 </node>
               </node>
             </node>
@@ -6350,11 +6350,11 @@
                     <ref role="3cqZAo" node="6HT7BWBPd0T" resolve="value" />
                   </node>
                   <node concept="liA8E" id="3K_0akS_wH1" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Term.arguments():java.util.Collection" resolve="arguments" />
+                    <ref role="37wK5l" to="yt73:~Term.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3K_0akS_wH2" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                  <ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
                 </node>
               </node>
             </node>
@@ -6365,7 +6365,7 @@
                 <ref role="3cqZAo" node="3K_0akS_wGU" resolve="it" />
               </node>
               <node concept="liA8E" id="3K_0akS_wH6" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
               </node>
             </node>
           </node>
@@ -6380,7 +6380,7 @@
                   <ref role="3cqZAo" node="3K_0akS_wGU" resolve="it" />
                 </node>
                 <node concept="liA8E" id="5YIOneOTrts" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                  <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                 </node>
               </node>
             </node>
@@ -6409,11 +6409,11 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3t7_2FgLmh_" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                    <ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgLmhA" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                  <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                 </node>
               </node>
             </node>
@@ -6440,7 +6440,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgLjnj" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="3t7_2FgLjnk" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -6666,11 +6666,11 @@
                     <ref role="3cqZAo" node="3K_0akS_pDi" resolve="p1" />
                   </node>
                   <node concept="liA8E" id="6HT7BWBPhwQ" role="2OqNvi">
-                    <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                    <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                   </node>
                 </node>
                 <node concept="liA8E" id="6HT7BWBPhwR" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                  <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
                 </node>
               </node>
             </node>
@@ -6706,11 +6706,11 @@
                     <ref role="3cqZAo" node="6HT7BWBPhwM" resolve="value" />
                   </node>
                   <node concept="liA8E" id="3K_0akS_pDV" role="2OqNvi">
-                    <ref role="37wK5l" to="yt73:~Term.arguments():java.util.Collection" resolve="arguments" />
+                    <ref role="37wK5l" to="yt73:~Term.arguments()" resolve="arguments" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3K_0akS_pDW" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                  <ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
                 </node>
               </node>
             </node>
@@ -6721,7 +6721,7 @@
                 <ref role="3cqZAo" node="3K_0akS_pDO" resolve="it" />
               </node>
               <node concept="liA8E" id="3K_0akS_pE0" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
               </node>
             </node>
           </node>
@@ -6736,7 +6736,7 @@
                   <ref role="3cqZAo" node="3K_0akS_pDO" resolve="it" />
                 </node>
                 <node concept="liA8E" id="5YIOneOTmzR" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                  <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                 </node>
               </node>
             </node>
@@ -6765,11 +6765,11 @@
                     </node>
                   </node>
                   <node concept="liA8E" id="3t7_2FgLnZI" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~Collection.iterator():java.util.Iterator" resolve="iterator" />
+                    <ref role="37wK5l" to="33ny:~Collection.iterator()" resolve="iterator" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgLnZJ" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                  <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                 </node>
               </node>
             </node>
@@ -6796,7 +6796,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3t7_2FgLgwS" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                  <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                   <node concept="3cmrfG" id="3t7_2FgLg_$" role="37wK5m">
                     <property role="3cmrfH" value="0" />
                   </node>
@@ -7141,7 +7141,7 @@
                 <ref role="3cqZAo" node="6N2bvv_uTT3" resolve="x" />
               </node>
               <node concept="liA8E" id="6N2bvv_uVfr" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="6N2bvv_uVfI" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -7187,7 +7187,7 @@
                 <ref role="3cqZAo" node="6N2bvv_uTTM" resolve="y" />
               </node>
               <node concept="liA8E" id="6N2bvv_uWmD" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="6N2bvv_uWmW" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -7217,7 +7217,7 @@
                 <ref role="3cqZAo" node="6N2bvv_uWqJ" resolve="z" />
               </node>
               <node concept="liA8E" id="6N2bvv_uWrJ" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="6N2bvv_uWrK" role="37wK5m">
                   <property role="Xl_RC" value="bar" />
                 </node>
@@ -7682,7 +7682,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzB$SYy" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzB$T98" role="37wK5m">
                   <ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzB$ThZ" role="37wK5m">
@@ -7766,7 +7766,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBDVxE" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBDVCz" role="37wK5m">
                   <ref role="37wK5l" node="6SwZmzBDxdZ" resolve="asStringLogical" />
                   <node concept="37vLTw" id="6SwZmzBDVQT" role="37wK5m">
@@ -8207,7 +8207,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL15UsS" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="1oi1Uc" id="390NiL15U$k" role="37wK5m">
                   <node concept="1oi5UN" id="390NiL15UG0" role="1oi0x0">
                     <node concept="1oi5Wm" id="390NiL15UG2" role="1ojpOf">
@@ -8263,7 +8263,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBF$71" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBF$j1" role="37wK5m">
                   <ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBF$wl" role="37wK5m">
@@ -8315,7 +8315,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBEcXI" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="6SwZmzBEd4F" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -8364,7 +8364,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBEnlT" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBEntc" role="37wK5m">
                   <ref role="37wK5l" node="6SwZmzBDxdZ" resolve="asStringLogical" />
                   <node concept="37vLTw" id="6SwZmzBEnGV" role="37wK5m">
@@ -8545,7 +8545,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBARwE" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBAR$P" role="37wK5m">
                   <ref role="37wK5l" node="390NiL15T3$" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBARGN" role="37wK5m">
@@ -8713,7 +8713,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL16XbS" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="1oi1Uc" id="390NiL16Xcr" role="37wK5m">
                   <node concept="1oi5UN" id="390NiL16Xgj" role="1oi0x0">
                     <node concept="1oi5Wm" id="390NiL16Xgl" role="1ojpOf">
@@ -9091,7 +9091,7 @@
                 <ref role="3cqZAo" node="390NiL14HhZ" resolve="x" />
               </node>
               <node concept="liA8E" id="390NiL14Hir" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="390NiL14His" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -9147,7 +9147,7 @@
                 <ref role="3cqZAo" node="390NiL14Hi5" resolve="y" />
               </node>
               <node concept="liA8E" id="390NiL14HiB" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="390NiL14HiC" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -9182,7 +9182,7 @@
                 <ref role="3cqZAo" node="390NiL14Hib" resolve="z" />
               </node>
               <node concept="liA8E" id="390NiL14HiN" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="390NiL14HiO" role="37wK5m">
                   <property role="Xl_RC" value="bar" />
                 </node>
@@ -9677,7 +9677,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBAFqu" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBAFuk" role="37wK5m">
                   <ref role="37wK5l" node="390NiL16pUf" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBAFBb" role="37wK5m">
@@ -9761,7 +9761,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBF8hC" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBF8hD" role="37wK5m">
                   <ref role="37wK5l" node="6SwZmzBEAPo" resolve="asStringLogical" />
                   <node concept="37vLTw" id="6SwZmzBF8hE" role="37wK5m">
@@ -10232,7 +10232,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL16dSg" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="1oi1Uc" id="390NiL16dSh" role="37wK5m">
                   <node concept="1oi5UN" id="390NiL16dSi" role="1oi0x0">
                     <node concept="1oi5Wm" id="390NiL16dSj" role="1ojpOf">
@@ -10288,7 +10288,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBFIh7" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBFIh8" role="37wK5m">
                   <ref role="37wK5l" node="390NiL16pUf" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBFIh9" role="37wK5m">
@@ -10340,7 +10340,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBFOXV" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="Xl_RD" id="6SwZmzBFOXW" role="37wK5m">
                   <property role="Xl_RC" value="foo" />
                 </node>
@@ -10389,7 +10389,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBFSS4" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBFSS5" role="37wK5m">
                   <ref role="37wK5l" node="6SwZmzBEAPo" resolve="asStringLogical" />
                   <node concept="37vLTw" id="6SwZmzBFSS6" role="37wK5m">
@@ -10559,7 +10559,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="6SwZmzBB4Lf" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical):void" resolve="union" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.union(jetbrains.mps.logic.reactor.logical.MutableLogical)" resolve="union" />
                 <node concept="1rXfSq" id="6SwZmzBB4Pq" role="37wK5m">
                   <ref role="37wK5l" node="390NiL16pUf" resolve="asTermLogical" />
                   <node concept="37vLTw" id="6SwZmzBB4YH" role="37wK5m">
@@ -10722,7 +10722,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="390NiL171eP" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object):void" resolve="setValue" />
+                <ref role="37wK5l" to="bj13:~MutableLogical.setValue(java.lang.Object)" resolve="setValue" />
                 <node concept="1oi1Uc" id="390NiL171eQ" role="37wK5m">
                   <node concept="1oi5UN" id="390NiL171eR" role="1oi0x0">
                     <node concept="1oi5Wm" id="390NiL171eS" role="1ojpOf">
diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd b/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
index 4114ad88..494d96c7 100644
--- a/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
+++ b/coderules/solutions/jetbrains.mps.reporting.runtime/jetbrains.mps.reporting.runtime.msd
@@ -18,7 +18,7 @@
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
diff --git a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
index a6eb6f8a..916e4428 100644
--- a/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
+++ b/coderules/solutions/jetbrains.mps.reporting.runtime/models/jetbrains.mps.lang.typesystem2.reporting.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps
index 57bce355..946ffa29 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/models/editor.mps
@@ -359,7 +359,7 @@
             <node concept="3clFbS" id="$u9BK_zdQj" role="2VODD2">
               <node concept="3clFbF" id="$u9BK_zdQk" role="3cqZAp">
                 <node concept="2YIFZM" id="$u9BK_zdQl" role="3clFbG">
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                   <node concept="2OqwBi" id="$u9BK_zdQm" role="37wK5m">
                     <node concept="pncrf" id="$u9BK_zdQn" role="2Oq$k0" />
diff --git a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
index 5709d667..c5c99f1b 100644
--- a/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.firstOrderLogic/samples.fitch.firstOrderLogic.mpl
@@ -23,12 +23,12 @@
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -75,16 +75,16 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
diff --git a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
index ae4ee041..3c1d78c3 100644
--- a/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.herbrandLogic/samples.fitch.herbrandLogic.mpl
@@ -23,12 +23,12 @@
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -76,16 +76,16 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
index 266fc5b1..fe036468 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/constraints.mps
@@ -5,7 +5,7 @@
     <use id="3f4bc5f5-c6c1-4a28-8b10-c83066ffa4a1" name="jetbrains.mps.lang.constraints" version="4" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <devkit ref="00000000-0000-4000-0000-5604ebd4f22c(jetbrains.mps.devkit.aspect.constraints)" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps
index 80d7f41b..46556f84 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/editor.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="12" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="daafa647-f1f7-4b0b-b096-69cd7c8408c0" name="jetbrains.mps.baseLanguage.regexp" version="0" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
index 4d209b39..20b0638a 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/models/types.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="0" />
diff --git a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
index 39065cd5..ab53b6e6 100644
--- a/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
+++ b/samples/fitch/languages/samples.fitch.propositionalLogic/samples.fitch.propositionalLogic.mpl
@@ -23,12 +23,12 @@
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -74,16 +74,16 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
diff --git a/samples/fitch/languages/samples.fitch/models/constraints.mps b/samples/fitch/languages/samples.fitch/models/constraints.mps
index c09d8733..d1934ce9 100644
--- a/samples/fitch/languages/samples.fitch/models/constraints.mps
+++ b/samples/fitch/languages/samples.fitch/models/constraints.mps
@@ -426,7 +426,7 @@
                         <node concept="3clFbF" id="5p9vXslDHuK" role="3cqZAp">
                           <node concept="2YIFZM" id="5p9vXslDHuL" role="3clFbG">
                             <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                            <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                            <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
                             <node concept="2OqwBi" id="5p9vXslDHuM" role="37wK5m">
                               <node concept="1PxgMI" id="5p9vXslDHuN" role="2Oq$k0">
                                 <property role="1BlNFB" value="true" />
diff --git a/samples/fitch/languages/samples.fitch/models/editor.mps b/samples/fitch/languages/samples.fitch/models/editor.mps
index fc9875ae..b05f2cc4 100644
--- a/samples/fitch/languages/samples.fitch/models/editor.mps
+++ b/samples/fitch/languages/samples.fitch/models/editor.mps
@@ -292,7 +292,7 @@
                   <node concept="3clFbF" id="3JXBM6C3Sn7" role="3cqZAp">
                     <node concept="2YIFZM" id="3JXBM6C5W$o" role="3clFbG">
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
                       <node concept="2OqwBi" id="3JXBM6C5W$p" role="37wK5m">
                         <node concept="pncrf" id="3JXBM6C5W$q" role="2Oq$k0" />
                         <node concept="3TrcHB" id="3JXBM6C5W$r" role="2OqNvi">
@@ -399,7 +399,7 @@
           <node concept="3clFbF" id="3JXBM6C6Am4" role="3cqZAp">
             <node concept="2YIFZM" id="3JXBM6C6BDU" role="3clFbG">
               <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-              <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+              <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
               <node concept="2OqwBi" id="3JXBM6C6AC_" role="37wK5m">
                 <node concept="1WAUZh" id="3JXBM6C6Am3" role="2Oq$k0" />
                 <node concept="3TrcHB" id="3JXBM6C6AXv" role="2OqNvi">
@@ -427,7 +427,7 @@
                 </node>
               </node>
               <node concept="2YIFZM" id="5jVx7S23rqO" role="3uHU7w">
-                <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
                 <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                 <node concept="2OqwBi" id="5jVx7S23rqP" role="37wK5m">
                   <node concept="1WAUZh" id="5jVx7S23rqQ" role="2Oq$k0" />
@@ -523,7 +523,7 @@
             <node concept="3clFbS" id="$u9BK_z3DS" role="2VODD2">
               <node concept="3clFbF" id="$u9BK_z3DT" role="3cqZAp">
                 <node concept="2YIFZM" id="$u9BK_z3DU" role="3clFbG">
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
                   <node concept="2OqwBi" id="$u9BK_z3DV" role="37wK5m">
                     <node concept="pncrf" id="$u9BK_z3DW" role="2Oq$k0" />
@@ -560,7 +560,7 @@
               <node concept="3clFbF" id="$u9BK_zdQk" role="3cqZAp">
                 <node concept="2YIFZM" id="$u9BK_zdQl" role="3clFbG">
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
                   <node concept="2OqwBi" id="$u9BK_zdQm" role="37wK5m">
                     <node concept="pncrf" id="$u9BK_zdQn" role="2Oq$k0" />
                     <node concept="3TrcHB" id="$u9BK_zdQo" role="2OqNvi">
@@ -746,7 +746,7 @@
               <node concept="3clFbF" id="$u9BK__JRI" role="3cqZAp">
                 <node concept="2YIFZM" id="$u9BK__JRJ" role="3clFbG">
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
                   <node concept="2OqwBi" id="$u9BK__JRK" role="37wK5m">
                     <node concept="pncrf" id="$u9BK__JRL" role="2Oq$k0" />
                     <node concept="3TrcHB" id="$u9BK__JRM" role="2OqNvi">
diff --git a/samples/fitch/languages/samples.fitch/samples.fitch.mpl b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
index 03edbde3..b3b87c88 100644
--- a/samples/fitch/languages/samples.fitch/samples.fitch.mpl
+++ b/samples/fitch/languages/samples.fitch/samples.fitch.mpl
@@ -23,12 +23,12 @@
         <language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
         <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
         <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+        <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
         <language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
         <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+        <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
         <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+        <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
         <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
         <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
       </languageVersions>
@@ -75,18 +75,18 @@
     <language slang="l:0272d3b4-4cc8-481e-9e2f-07793fbfcb41:jetbrains.mps.lang.editor.table" version="0" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:90746344-04fd-4286-97d5-b46ae6a81709:jetbrains.mps.lang.migration" version="1" />
     <language slang="l:9882f4ad-1955-46fe-8269-94189e5dbbf2:jetbrains.mps.lang.migration.util" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:1a8554c4-eb84-43ba-8c34-6f0d90c6e75a:jetbrains.mps.lang.smodel.query" version="3" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
index e72a79e2..675bdcb4 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/firstOrderLogic@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
@@ -409,7 +409,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -425,7 +425,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
index cc0a3b76..910e17a4 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/herbrandLogic@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
@@ -202,7 +202,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -218,7 +218,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
index 67664183..03c0fb8b 100644
--- a/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
+++ b/samples/fitch/solutions/samples.fitch.demo/models/propositionalLogic@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
@@ -576,7 +576,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -592,7 +592,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd b/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
index d6ceeab5..20f3dedd 100644
--- a/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
+++ b/samples/fitch/solutions/samples.fitch.demo/samples.fitch.demo.msd
@@ -22,7 +22,7 @@
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:06b7c5c7-e359-4f4b-a581-5d0c9323af39:samples.fitch" version="1" />
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps
index 1c4e8ba0..023fc57c 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/behavior.mps
@@ -349,7 +349,7 @@
                           <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
                         </node>
                         <node concept="liA8E" id="48ZGLP7qpbn" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                          <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                           <node concept="3cpWs3" id="48ZGLP7qugQ" role="37wK5m">
                             <node concept="Xl_RD" id="48ZGLP7quCC" role="3uHU7B">
                               <property role="Xl_RC" value=" " />
@@ -384,7 +384,7 @@
                   <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
                 </node>
                 <node concept="liA8E" id="48ZGLP7qSsi" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(char):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(char)" resolve="append" />
                   <node concept="1Xhbcc" id="48ZGLP7qSLW" role="37wK5m">
                     <property role="1XhdNS" value=" " />
                   </node>
@@ -397,7 +397,7 @@
                   <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
                 </node>
                 <node concept="liA8E" id="48ZGLP7qWSm" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="2EnYce" id="48ZGLP7r6m5" role="37wK5m">
                     <node concept="37vLTw" id="48ZGLP7qXAG" role="2Oq$k0">
                       <ref role="3cqZAo" node="48ZGLP7q4CP" resolve="tv" />
@@ -429,7 +429,7 @@
               <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
             </node>
             <node concept="liA8E" id="48ZGLP7rlnw" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
               <node concept="Xl_RD" id="2O9ahh6oTGb" role="37wK5m">
                 <property role="Xl_RC" value=". " />
               </node>
@@ -491,7 +491,7 @@
                     <ref role="3cqZAo" node="2O9ahh6o8KR" resolve="it" />
                   </node>
                   <node concept="liA8E" id="2O9ahh6o8Lq" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                    <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                   </node>
                 </node>
               </node>
@@ -505,7 +505,7 @@
                       <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
                     </node>
                     <node concept="liA8E" id="2O9ahh6p9BQ" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(char):java.lang.StringBuilder" resolve="append" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(char)" resolve="append" />
                       <node concept="1Xhbcc" id="2O9ahh6pau5" role="37wK5m">
                         <property role="1XhdNS" value="(" />
                       </node>
@@ -523,7 +523,7 @@
                   <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
                 </node>
                 <node concept="liA8E" id="2O9ahh6o$J4" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="2EnYce" id="2O9ahh6oEkk" role="37wK5m">
                     <node concept="37vLTw" id="2O9ahh6o_AG" role="2Oq$k0">
                       <ref role="3cqZAo" node="2O9ahh6o8Lk" resolve="ctr" />
@@ -545,7 +545,7 @@
                         <ref role="3cqZAo" node="2O9ahh6o8KR" resolve="it" />
                       </node>
                       <node concept="liA8E" id="2O9ahh6oRK$" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                        <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="2O9ahh6oNi2" role="37vLTJ">
@@ -559,7 +559,7 @@
                       <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
                     </node>
                     <node concept="liA8E" id="2O9ahh6ou4$" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                       <node concept="Xl_RD" id="2O9ahh6ouSV" role="37wK5m">
                         <property role="Xl_RC" value=", " />
                       </node>
@@ -572,7 +572,7 @@
                       <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
                     </node>
                     <node concept="liA8E" id="2O9ahh6oJvQ" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                       <node concept="2EnYce" id="2O9ahh6oJvR" role="37wK5m">
                         <node concept="37vLTw" id="2O9ahh6oJvS" role="2Oq$k0">
                           <ref role="3cqZAo" node="2O9ahh6o8Lk" resolve="ctr" />
@@ -590,7 +590,7 @@
                   <ref role="3cqZAo" node="2O9ahh6o8KR" resolve="it" />
                 </node>
                 <node concept="liA8E" id="2O9ahh6omjU" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                  <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
                 </node>
               </node>
             </node>
@@ -603,7 +603,7 @@
                       <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
                     </node>
                     <node concept="liA8E" id="2O9ahh6pedQ" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(char):java.lang.StringBuilder" resolve="append" />
+                      <ref role="37wK5l" to="wyt6:~StringBuilder.append(char)" resolve="append" />
                       <node concept="1Xhbcc" id="2O9ahh6pedR" role="37wK5m">
                         <property role="1XhdNS" value=")" />
                       </node>
@@ -621,7 +621,7 @@
                   <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
                 </node>
                 <node concept="liA8E" id="2O9ahh6nVDm" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+                  <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
                   <node concept="Xl_RD" id="2O9ahh6o3Ol" role="37wK5m">
                     <property role="Xl_RC" value=" ⇒ " />
                   </node>
@@ -648,7 +648,7 @@
               <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
             </node>
             <node concept="liA8E" id="48ZGLP7ryWq" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String):java.lang.StringBuilder" resolve="append" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.append(java.lang.String)" resolve="append" />
               <node concept="2EnYce" id="48ZGLP7rBly" role="37wK5m">
                 <node concept="2OqwBi" id="48ZGLP7r__E" role="2Oq$k0">
                   <node concept="13iPFW" id="48ZGLP7rzTU" role="2Oq$k0" />
@@ -669,7 +669,7 @@
               <ref role="3cqZAo" node="48ZGLP7q4g6" resolve="s" />
             </node>
             <node concept="liA8E" id="48ZGLP7rrdq" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~StringBuilder.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~StringBuilder.toString()" resolve="toString" />
             </node>
           </node>
         </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps
index 8ce04dce..27e34a31 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/constraints.mps
@@ -336,7 +336,7 @@
             <node concept="2OqwBi" id="hDMFLSy" role="3clFbG">
               <node concept="1Wqviy" id="hDMFLSz" role="2Oq$k0" />
               <node concept="liA8E" id="hDMFLS$" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
+                <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                 <node concept="Xl_RD" id="hDMFLS_" role="37wK5m">
                   <property role="Xl_RC" value="[a-zA-Z$[_]][a-zA-Z0-9$[_]]*" />
                 </node>
@@ -1855,7 +1855,7 @@
             <node concept="2OqwBi" id="48ZGLP8$iQH" role="3clFbG">
               <node concept="1Wqviy" id="48ZGLP8$g_T" role="2Oq$k0" />
               <node concept="liA8E" id="48ZGLP8$jpb" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String):boolean" resolve="matches" />
+                <ref role="37wK5l" to="wyt6:~String.matches(java.lang.String)" resolve="matches" />
                 <node concept="Xl_RD" id="48ZGLP8$j_d" role="37wK5m">
                   <property role="Xl_RC" value="[a-z$[_]][a-z0-9$[_]]*" />
                 </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
index 0a0c1c92..7bd9d07c 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
+++ b/samples/lambdacalc/languages/samples.lambdacalc/models/types.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <languages>
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="af858d84-85f2-42f4-a854-0b3c6b5cd482" name="samples.lambdacalc" version="-1" />
     <use id="ed6d7656-532c-4bc2-81d1-af945aeb8280" name="jetbrains.mps.baseLanguage.blTypes" version="-1" />
     <use id="9ded098b-ad6a-4657-bfd9-48636cfe8bc3" name="jetbrains.mps.lang.traceable" version="-1" />
@@ -3285,7 +3285,7 @@
                         <property role="2s7ueQ" value="error" />
                         <node concept="2YIFZM" id="6K6UrSyIfsz" role="2s7u9n">
                           <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                          <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...):java.lang.String" resolve="format" />
+                          <ref role="37wK5l" to="wyt6:~String.format(java.lang.String,java.lang.Object...)" resolve="format" />
                           <node concept="Xl_RD" id="6K6UrSyIfs$" role="37wK5m">
                             <property role="Xl_RC" value="cannot unify '%s' and '%s'" />
                           </node>
@@ -4092,11 +4092,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="5zncGqweSkF" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="5zncGqweSkG" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
           </node>
@@ -4169,11 +4169,11 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="48ZGLP8jezM" role="2OqNvi">
-                  <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                  <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                 </node>
               </node>
               <node concept="liA8E" id="48ZGLP8jhiA" role="2OqNvi">
-                <ref role="37wK5l" to="bj13:~Logical.value():java.lang.Object" resolve="value" />
+                <ref role="37wK5l" to="bj13:~Logical.value()" resolve="value" />
               </node>
             </node>
           </node>
diff --git a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
index ad9673ee..5c01a2f1 100644
--- a/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
+++ b/samples/lambdacalc/languages/samples.lambdacalc/samples.lambdacalc.mpl
@@ -41,16 +41,16 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:64d34fcd-ad02-4e73-aff8-a581124c2e30:jetbrains.mps.lang.findUsages" version="0" />
     <language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="2" />
-    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
+    <language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="1" />
     <language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
     <language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="1" />
     <language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
index 953a73d4..a81f99b1 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/models/samples.lambdacalc.demo@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
@@ -723,7 +723,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -739,7 +739,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
index be414c0e..b38bacad 100644
--- a/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
+++ b/samples/lambdacalc/solutions/samples.lambdacalc.demo/samples.lambdacalc.demo.msd
@@ -19,7 +19,7 @@
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
index 6a221bd5..e56023ee 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/jetbrains.mps.baseLanguageExt.mpl
@@ -36,9 +36,9 @@
     <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="12" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
-    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
+    <language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="1" />
     <language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:cba985fe-1e96-4f16-9f8d-b07434405d4f:jetbrains.mps.lang.smodel.types" version="0" />
     <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="7" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index 34e37253..9e85ae7a 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -1251,7 +1251,7 @@
               <ref role="359W_E" to="tpee:hGd03cG" resolve="BaseAssignmentExpression" />
             </node>
             <node concept="liA8E" id="5YmBCzQLx57" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
               <node concept="2OqwBi" id="5YmBCzQLxjw" role="37wK5m">
                 <node concept="3A2sRY" id="5YmBCzQLx5i" role="2Oq$k0">
                   <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
@@ -6572,7 +6572,7 @@
                           <ref role="359W_E" to="tpee:hGd03cG" resolve="BaseAssignmentExpression" />
                         </node>
                         <node concept="liA8E" id="6Yb9hAqRblB" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                          <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                           <node concept="2OqwBi" id="6Yb9hAqRb_n" role="37wK5m">
                             <node concept="3A2sRY" id="6Yb9hAqRbn9" role="2Oq$k0">
                               <ref role="3A2yKK" node="6Yb9hAqNAzu" resolve="varref" />
diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index b0123141..231d127a 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -7,10 +7,10 @@
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="c4803b19-6d89-4a3b-bf82-390769514add" name="jetbrains.mps.lang.coderules" version="15" />
     <use id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples" version="-1" />
-    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="-1" />
+    <use id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation" version="1" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="-1" />
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="-1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="-1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="-1" />
     <use id="cba985fe-1e96-4f16-9f8d-b07434405d4f" name="jetbrains.mps.lang.smodel.types" version="-1" />
     <use id="4b5b4f8d-d30a-4ef8-9bf4-dfd26af9d462" name="jetbrains.mps.lang.typechecking" version="-1" />
@@ -4366,7 +4366,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="6EY0p2ymzYJ" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                           </node>
                         </node>
                       </node>
@@ -6960,7 +6960,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="3jXBvmTFgtM" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                             </node>
                           </node>
                           <node concept="2OqwBi" id="3jXBvmTFgtN" role="3uHU7B">
@@ -6977,7 +6977,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="3jXBvmTFgtT" role="2OqNvi">
-                              <ref role="37wK5l" to="bj13:~Logical.findRoot():jetbrains.mps.logic.reactor.logical.Logical" resolve="findRoot" />
+                              <ref role="37wK5l" to="bj13:~Logical.findRoot()" resolve="findRoot" />
                             </node>
                           </node>
                         </node>
@@ -13289,7 +13289,7 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="12QmIo_9Mxv" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                                 </node>
                               </node>
                             </node>
@@ -14296,7 +14296,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="72RDgINqSZb" role="2OqNvi">
-                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                 </node>
               </node>
               <node concept="2tJFMh" id="72RDgINng5g" role="3uHU7w">
@@ -19425,7 +19425,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="Lu45F7uK9i" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                             </node>
                           </node>
                         </node>
@@ -19565,7 +19565,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="Lu45F7uK5M" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                             </node>
                           </node>
                         </node>
@@ -19648,7 +19648,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="7lt0LtQoNGD" role="2OqNvi">
-                                <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                                <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                                 <node concept="2OqwBi" id="7lt0LtQmO_N" role="37wK5m">
                                   <node concept="1TmgYN" id="7lt0LtQmO_O" role="2Oq$k0">
                                     <node concept="1nq8_$" id="7lt0LtQmO_P" role="1Tms7$">
@@ -19778,7 +19778,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="Lu45F7uK6m" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                             </node>
                           </node>
                         </node>
@@ -21528,7 +21528,7 @@
                 <ref role="3cqZAo" node="3KV3FXk1ku9" resolve="resultList" />
               </node>
               <node concept="liA8E" id="3KV3FXk1lxk" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
               </node>
             </node>
           </node>
@@ -21740,7 +21740,7 @@
           <node concept="3clFbS" id="3KV3FXk1J8f" role="3clFbx">
             <node concept="3cpWs6" id="3KV3FXk1J8g" role="3cqZAp">
               <node concept="2YIFZM" id="3KV3FXk1J8h" role="3cqZAk">
-                <ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
+                <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
                 <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
               </node>
             </node>
@@ -21752,11 +21752,11 @@
                   <ref role="3cqZAo" node="3KV3FXk1J2H" resolve="allPathsList" />
                 </node>
                 <node concept="liA8E" id="3KV3FXk1J8t" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
+                  <ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
                 </node>
               </node>
               <node concept="liA8E" id="3KV3FXk1J8u" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
               </node>
             </node>
           </node>
@@ -21829,7 +21829,7 @@
                         <ref role="3cqZAo" node="3KV3FXk1Nl3" resolve="pathListIt" />
                       </node>
                       <node concept="liA8E" id="3KV3FXk1OUC" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                        <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                       </node>
                     </node>
                   </node>
@@ -21857,7 +21857,7 @@
                       <ref role="3cqZAo" node="3KV3FXk1Lsq" resolve="candidatePath" />
                     </node>
                     <node concept="liA8E" id="3KV3FXk1PPB" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                       <node concept="37vLTw" id="3KV3FXk1PRF" role="37wK5m">
                         <ref role="3cqZAo" node="3KV3FXk1OU$" resolve="next" />
                       </node>
@@ -21872,13 +21872,13 @@
                           <ref role="3cqZAo" node="3KV3FXk1Lsq" resolve="candidatePath" />
                         </node>
                         <node concept="liA8E" id="3KV3FXk1QzY" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                          <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                           <node concept="2OqwBi" id="3KV3FXk1QE9" role="37wK5m">
                             <node concept="37vLTw" id="3KV3FXk1QAl" role="2Oq$k0">
                               <ref role="3cqZAo" node="3KV3FXk1Nl3" resolve="pathListIt" />
                             </node>
                             <node concept="liA8E" id="3KV3FXk1QMB" role="2OqNvi">
-                              <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                              <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                             </node>
                           </node>
                         </node>
@@ -21890,7 +21890,7 @@
                       <ref role="3cqZAo" node="3KV3FXk1Nl3" resolve="pathListIt" />
                     </node>
                     <node concept="liA8E" id="3KV3FXk1Qbe" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                      <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
                     </node>
                   </node>
                 </node>
@@ -21910,7 +21910,7 @@
                     <ref role="3cqZAo" node="3KV3FXk1Nag" resolve="pathList" />
                   </node>
                   <node concept="liA8E" id="3KV3FXk1O93" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
+                    <ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
                   </node>
                 </node>
               </node>
@@ -21919,7 +21919,7 @@
                   <ref role="3cqZAo" node="3KV3FXk1Nl3" resolve="pathListIt" />
                 </node>
                 <node concept="liA8E" id="3KV3FXk1Ovm" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                  <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
                 </node>
               </node>
             </node>
@@ -21928,7 +21928,7 @@
               <node concept="3clFbS" id="3KV3FXk1R1n" role="3clFbx">
                 <node concept="3clFbF" id="5_6ImQZl_Vo" role="3cqZAp">
                   <node concept="2YIFZM" id="5_6ImQZl_Y0" role="3clFbG">
-                    <ref role="37wK5l" to="33ny:~Collections.reverse(java.util.List):void" resolve="reverse" />
+                    <ref role="37wK5l" to="33ny:~Collections.reverse(java.util.List)" resolve="reverse" />
                     <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
                     <node concept="37vLTw" id="5_6ImQZl_Z7" role="37wK5m">
                       <ref role="3cqZAo" node="3KV3FXk1Lsq" resolve="candidatePath" />
@@ -21961,7 +21961,7 @@
                           <ref role="3cqZAo" node="3KV3FXk1KVn" resolve="result" />
                         </node>
                         <node concept="liA8E" id="3KV3FXk2gcq" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                          <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
                         </node>
                       </node>
                       <node concept="2OqwBi" id="3KV3FXk2gcr" role="3uHU7B">
@@ -21969,7 +21969,7 @@
                           <ref role="3cqZAo" node="3KV3FXk1Lsq" resolve="candidatePath" />
                         </node>
                         <node concept="liA8E" id="3KV3FXk2gct" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                          <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
                         </node>
                       </node>
                     </node>
@@ -21981,7 +21981,7 @@
                       <ref role="3cqZAo" node="3KV3FXk1Lsq" resolve="candidatePath" />
                     </node>
                     <node concept="liA8E" id="3KV3FXk1T2N" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+                      <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
                     </node>
                   </node>
                 </node>
@@ -22087,7 +22087,7 @@
                       <ref role="3cqZAo" node="5H6hZahoMRV" resolve="components" />
                     </node>
                     <node concept="liA8E" id="5H6hZahszJg" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                      <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
                     </node>
                   </node>
                 </node>
@@ -22113,7 +22113,7 @@
                       <ref role="3cqZAo" node="5H6hZahoMRV" resolve="components" />
                     </node>
                     <node concept="liA8E" id="5H6hZahszJr" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.get(int):java.lang.Object" resolve="get" />
+                      <ref role="37wK5l" to="33ny:~List.get(int)" resolve="get" />
                       <node concept="37vLTw" id="5H6hZahszJs" role="37wK5m">
                         <ref role="3cqZAo" node="5H6hZahszJx" resolve="i" />
                       </node>
@@ -22147,7 +22147,7 @@
                 <ref role="3cqZAo" node="5H6hZahoMRV" resolve="components" />
               </node>
               <node concept="liA8E" id="5H6hZahszJB" role="2OqNvi">
-                <ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
+                <ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
               </node>
             </node>
             <node concept="37vLTw" id="5H6hZahszJC" role="3uHU7B">
@@ -22462,7 +22462,7 @@
               <ref role="3cqZAo" node="3KV3FXk0pld" resolve="resultList" />
             </node>
             <node concept="liA8E" id="3KV3FXjZMUC" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+              <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
             </node>
           </node>
           <node concept="3clFbS" id="3KV3FXjZMUD" role="3clFbx">
@@ -22707,7 +22707,7 @@
           <node concept="3clFbS" id="3KV3FXjZHiu" role="3clFbx">
             <node concept="3cpWs6" id="3KV3FXjZHiv" role="3cqZAp">
               <node concept="2YIFZM" id="3KV3FXk0Mm4" role="3cqZAk">
-                <ref role="37wK5l" to="33ny:~Collections.emptyList():java.util.List" resolve="emptyList" />
+                <ref role="37wK5l" to="33ny:~Collections.emptyList()" resolve="emptyList" />
                 <ref role="1Pybhc" to="33ny:~Collections" resolve="Collections" />
               </node>
             </node>
@@ -22720,11 +22720,11 @@
                     <ref role="3cqZAo" node="3KV3FXjZHik" resolve="rightPaths" />
                   </node>
                   <node concept="liA8E" id="3KV3FXjZHiA" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
+                    <ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3KV3FXjZHiB" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                  <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
                 </node>
               </node>
             </node>
@@ -22735,11 +22735,11 @@
                     <ref role="3cqZAo" node="3KV3FXjZHia" resolve="leftPaths" />
                   </node>
                   <node concept="liA8E" id="3KV3FXjZHiG" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
+                    <ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
                   </node>
                 </node>
                 <node concept="liA8E" id="3KV3FXjZHiH" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                  <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
                 </node>
               </node>
             </node>
@@ -22803,7 +22803,7 @@
                       <ref role="3cqZAo" node="3KV3FXjZMUd" resolve="resultList" />
                     </node>
                     <node concept="liA8E" id="3KV3FXjZMUq" role="2OqNvi">
-                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                      <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                       <node concept="37vLTw" id="3KV3FXjZMUr" role="37wK5m">
                         <ref role="3cqZAo" node="3KV3FXjZMUx" resolve="c" />
                       </node>
@@ -22920,7 +22920,7 @@
                         <ref role="3cqZAo" node="3KV3FXjZDGL" resolve="leftPath" />
                       </node>
                       <node concept="liA8E" id="3KV3FXjZDHc" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
+                        <ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
                       </node>
                     </node>
                   </node>
@@ -22941,7 +22941,7 @@
                         <ref role="3cqZAo" node="3KV3FXjZDGV" resolve="rightPath" />
                       </node>
                       <node concept="liA8E" id="3KV3FXjZDHk" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
+                        <ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
                       </node>
                     </node>
                   </node>
@@ -22968,7 +22968,7 @@
                             <ref role="3cqZAo" node="3KV3FXjZDH6" resolve="leftIt" />
                           </node>
                           <node concept="liA8E" id="3KV3FXjZDHx" role="2OqNvi">
-                            <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                            <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                           </node>
                         </node>
                       </node>
@@ -22984,7 +22984,7 @@
                             <ref role="3cqZAo" node="3KV3FXjZDHe" resolve="rightIt" />
                           </node>
                           <node concept="liA8E" id="3KV3FXjZDHB" role="2OqNvi">
-                            <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                            <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                           </node>
                         </node>
                       </node>
@@ -23015,7 +23015,7 @@
                                   <ref role="3cqZAo" node="3KV3FXjZG69" resolve="intermediateList" />
                                 </node>
                                 <node concept="liA8E" id="3KV3FXjZDHR" role="2OqNvi">
-                                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                                   <node concept="37vLTw" id="3KV3FXjZDHS" role="37wK5m">
                                     <ref role="3cqZAo" node="3KV3FXjZDHn" resolve="lastMatch" />
                                   </node>
@@ -23078,7 +23078,7 @@
                         <ref role="3cqZAo" node="3KV3FXjZDHe" resolve="rightIt" />
                       </node>
                       <node concept="liA8E" id="3KV3FXjZDIi" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                        <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="3KV3FXjZDIj" role="3uHU7B">
@@ -23086,7 +23086,7 @@
                         <ref role="3cqZAo" node="3KV3FXjZDH6" resolve="leftIt" />
                       </node>
                       <node concept="liA8E" id="3KV3FXjZDIl" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                        <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
                       </node>
                     </node>
                   </node>
@@ -23100,7 +23100,7 @@
                           <ref role="3cqZAo" node="3KV3FXjZG64" resolve="candidateList" />
                         </node>
                         <node concept="liA8E" id="3KV3FXjZDIs" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                          <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                           <node concept="37vLTw" id="3KV3FXjZDIt" role="37wK5m">
                             <ref role="3cqZAo" node="3KV3FXjZDHn" resolve="lastMatch" />
                           </node>
@@ -23293,7 +23293,7 @@
                         <ref role="3cqZAo" node="3KV3FXk0DmJ" resolve="pathIt" />
                       </node>
                       <node concept="liA8E" id="3KV3FXk0DlC" role="2OqNvi">
-                        <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                        <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                       </node>
                     </node>
                     <node concept="37vLTw" id="3KV3FXk0DlD" role="37vLTJ">
@@ -23323,7 +23323,7 @@
                           <ref role="3cqZAo" node="3KV3FXk0Dli" resolve="tmpList" />
                         </node>
                         <node concept="liA8E" id="3KV3FXk0DlR" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                          <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                           <node concept="37vLTw" id="3KV3FXk0DlS" role="37wK5m">
                             <ref role="3cqZAo" node="3KV3FXk0Dlw" resolve="next" />
                           </node>
@@ -23339,7 +23339,7 @@
                                 <ref role="3cqZAo" node="3KV3FXk0DmJ" resolve="pathIt" />
                               </node>
                               <node concept="liA8E" id="3KV3FXk0Dm4" role="2OqNvi">
-                                <ref role="37wK5l" to="33ny:~Iterator.next():java.lang.Object" resolve="next" />
+                                <ref role="37wK5l" to="33ny:~Iterator.next()" resolve="next" />
                               </node>
                             </node>
                             <node concept="37vLTw" id="3KV3FXk0Dm5" role="37vLTJ">
@@ -23355,7 +23355,7 @@
                                   <ref role="3cqZAo" node="3KV3FXjZG69" resolve="intermediateList" />
                                 </node>
                                 <node concept="liA8E" id="3KV3FXk0Dmr" role="2OqNvi">
-                                  <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection):boolean" resolve="addAll" />
+                                  <ref role="37wK5l" to="33ny:~List.addAll(java.util.Collection)" resolve="addAll" />
                                   <node concept="37vLTw" id="3KV3FXk0Dms" role="37wK5m">
                                     <ref role="3cqZAo" node="3KV3FXk0Dli" resolve="tmpList" />
                                   </node>
@@ -23368,7 +23368,7 @@
                                   <ref role="3cqZAo" node="3KV3FXk0Dli" resolve="tmpList" />
                                 </node>
                                 <node concept="liA8E" id="3KV3FXk0Dmw" role="2OqNvi">
-                                  <ref role="37wK5l" to="33ny:~List.clear():void" resolve="clear" />
+                                  <ref role="37wK5l" to="33ny:~List.clear()" resolve="clear" />
                                 </node>
                               </node>
                             </node>
@@ -23378,7 +23378,7 @@
                                   <ref role="3cqZAo" node="3KV3FXk0Dli" resolve="tmpList" />
                                 </node>
                                 <node concept="liA8E" id="3KV3FXk0Dm$" role="2OqNvi">
-                                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                                  <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                                   <node concept="37vLTw" id="3KV3FXk0Dm_" role="37wK5m">
                                     <ref role="3cqZAo" node="3KV3FXk0Dlw" resolve="next" />
                                   </node>
@@ -23404,7 +23404,7 @@
                                     <ref role="3cqZAo" node="3KV3FXk0Dli" resolve="tmpList" />
                                   </node>
                                   <node concept="liA8E" id="3KV3FXk0Dmb" role="2OqNvi">
-                                    <ref role="37wK5l" to="33ny:~List.add(java.lang.Object):boolean" resolve="add" />
+                                    <ref role="37wK5l" to="33ny:~List.add(java.lang.Object)" resolve="add" />
                                     <node concept="37vLTw" id="3KV3FXk0Dmc" role="37wK5m">
                                       <ref role="3cqZAo" node="3KV3FXk0Dlw" resolve="next" />
                                     </node>
@@ -23444,7 +23444,7 @@
                           <ref role="3cqZAo" node="3KV3FXk0DmJ" resolve="pathIt" />
                         </node>
                         <node concept="liA8E" id="3KV3FXk0DmF" role="2OqNvi">
-                          <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                          <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
                         </node>
                       </node>
                     </node>
@@ -23475,7 +23475,7 @@
                     <ref role="3cqZAo" node="3KV3FXk0Dlp" resolve="path" />
                   </node>
                   <node concept="liA8E" id="3KV3FXk0DmP" role="2OqNvi">
-                    <ref role="37wK5l" to="33ny:~List.iterator():java.util.Iterator" resolve="iterator" />
+                    <ref role="37wK5l" to="33ny:~List.iterator()" resolve="iterator" />
                   </node>
                 </node>
               </node>
@@ -23484,7 +23484,7 @@
                   <ref role="3cqZAo" node="3KV3FXk0DmJ" resolve="pathIt" />
                 </node>
                 <node concept="liA8E" id="3KV3FXk0DmS" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~Iterator.hasNext():boolean" resolve="hasNext" />
+                  <ref role="37wK5l" to="33ny:~Iterator.hasNext()" resolve="hasNext" />
                 </node>
               </node>
             </node>
@@ -23886,7 +23886,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="Lu45F7uK6Y" role="2OqNvi">
-                              <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                              <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                             </node>
                           </node>
                         </node>
@@ -24027,7 +24027,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="Lu45F7uK8N" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                               </node>
                             </node>
                           </node>
@@ -28066,7 +28066,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="7XRk2O3zfrf" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                               </node>
                             </node>
                           </node>
@@ -28240,7 +28240,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="7XRk2O3zfzf" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                           </node>
                         </node>
                       </node>
@@ -28293,7 +28293,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="7XRk2O3zf$t" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                           </node>
                         </node>
                       </node>
@@ -28577,7 +28577,7 @@
                             </node>
                           </node>
                           <node concept="liA8E" id="7XRk2O3zfyn" role="2OqNvi">
-                            <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                            <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                           </node>
                         </node>
                         <node concept="3txIi4" id="7XRk2O3zfAp" role="37wK5m" />
@@ -28690,7 +28690,7 @@
                                 </node>
                               </node>
                               <node concept="liA8E" id="7XRk2O3zfmX" role="2OqNvi">
-                                <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                               </node>
                             </node>
                           </node>
@@ -28725,7 +28725,7 @@
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="7XRk2O3zfn_" role="2OqNvi">
-                                  <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                                  <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                                 </node>
                               </node>
                             </node>
@@ -28806,7 +28806,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="Lu45F7uK6P" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SNode.getReference():org.jetbrains.mps.openapi.model.SNodeReference" resolve="getReference" />
+                      <ref role="37wK5l" to="mhbf:~SNode.getReference()" resolve="getReference" />
                     </node>
                   </node>
                 </node>
@@ -29484,14 +29484,14 @@
                 </node>
                 <node concept="2OqwBi" id="5XJPBczy$Fo" role="3K4GZi">
                   <node concept="2YIFZM" id="5XJPBczy$Fp" role="2Oq$k0">
-                    <ref role="37wK5l" to="zdap:~StringUtil.unescapeStringCharacters(java.lang.String):java.lang.String" resolve="unescapeStringCharacters" />
+                    <ref role="37wK5l" to="zdap:~StringUtil.unescapeStringCharacters(java.lang.String)" resolve="unescapeStringCharacters" />
                     <ref role="1Pybhc" to="zdap:~StringUtil" resolve="StringUtil" />
                     <node concept="3tDTZT" id="5XJPBczy$FJ" role="37wK5m">
                       <ref role="3tDTNw" node="5XJPBczyma3" resolve="value" />
                     </node>
                   </node>
                   <node concept="liA8E" id="5XJPBczy$Ft" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                    <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                     <node concept="3cmrfG" id="5XJPBczy$Fu" role="37wK5m">
                       <property role="3cmrfH" value="0" />
                     </node>
@@ -29623,7 +29623,7 @@
                     <node concept="37vLTI" id="5XJPBczAdnD" role="3clFbG">
                       <node concept="2YIFZM" id="5XJPBczAdnE" role="37vLTx">
                         <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                        <ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String,int):int" resolve="parseInt" />
+                        <ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String,int)" resolve="parseInt" />
                         <node concept="3tDTZT" id="5XJPBczBJDe" role="37wK5m">
                           <ref role="3tDTNw" node="5XJPBczyI4u" resolve="valueHex" />
                         </node>
@@ -29747,14 +29747,14 @@
                   <node concept="3clFbF" id="5XJPBczUo95" role="3cqZAp">
                     <node concept="37vLTI" id="5XJPBczUo97" role="3clFbG">
                       <node concept="2YIFZM" id="5XJPBczy_f5" role="37vLTx">
-                        <ref role="37wK5l" to="wyt6:~Long.parseLong(java.lang.String):long" resolve="parseLong" />
+                        <ref role="37wK5l" to="wyt6:~Long.parseLong(java.lang.String)" resolve="parseLong" />
                         <ref role="1Pybhc" to="wyt6:~Long" resolve="Long" />
                         <node concept="2OqwBi" id="7AyqXCdL52A" role="37wK5m">
                           <node concept="3tDTZT" id="5XJPBczyH9f" role="2Oq$k0">
                             <ref role="3tDTNw" node="5XJPBczy$RT" resolve="value" />
                           </node>
                           <node concept="liA8E" id="7AyqXCdL5oJ" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                            <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                             <node concept="3cmrfG" id="7AyqXCdL5oM" role="37wK5m">
                               <property role="3cmrfH" value="0" />
                             </node>
@@ -29767,7 +29767,7 @@
                                   <ref role="3tDTNw" node="5XJPBczy$RT" resolve="value" />
                                 </node>
                                 <node concept="liA8E" id="7AyqXCdL6Xp" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                  <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                                 </node>
                               </node>
                             </node>
@@ -29794,7 +29794,7 @@
                           <ref role="3tDTNw" node="5XJPBczy$RT" resolve="value" />
                         </node>
                         <node concept="liA8E" id="7AyqXCdL4s$" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String):boolean" resolve="endsWith" />
+                          <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
                           <node concept="Xl_RD" id="7AyqXCdL4sB" role="37wK5m">
                             <property role="Xl_RC" value="L" />
                           </node>
@@ -29805,7 +29805,7 @@
                           <ref role="3tDTNw" node="5XJPBczy$RT" resolve="value" />
                         </node>
                         <node concept="liA8E" id="7AyqXCdL4K1" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String):boolean" resolve="endsWith" />
+                          <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
                           <node concept="Xl_RD" id="7AyqXCdL4K2" role="37wK5m">
                             <property role="Xl_RC" value="l" />
                           </node>
@@ -29898,7 +29898,7 @@
                   <node concept="3clFbF" id="5XJPBczUoxN" role="3cqZAp">
                     <node concept="37vLTI" id="5XJPBczUoxP" role="3clFbG">
                       <node concept="2YIFZM" id="5XJPBczyBML" role="37vLTx">
-                        <ref role="37wK5l" to="wyt6:~Float.parseFloat(java.lang.String):float" resolve="parseFloat" />
+                        <ref role="37wK5l" to="wyt6:~Float.parseFloat(java.lang.String)" resolve="parseFloat" />
                         <ref role="1Pybhc" to="wyt6:~Float" resolve="Float" />
                         <node concept="3tDTZT" id="5XJPBczz8zC" role="37wK5m">
                           <ref role="3tDTNw" node="5XJPBczy_gf" resolve="value" />
@@ -30000,7 +30000,7 @@
                   <node concept="3clFbF" id="5XJPBczUoV8" role="3cqZAp">
                     <node concept="37vLTI" id="5XJPBczUoVa" role="3clFbG">
                       <node concept="2YIFZM" id="5XJPBczyDT1" role="37vLTx">
-                        <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String):double" resolve="parseDouble" />
+                        <ref role="37wK5l" to="wyt6:~Double.parseDouble(java.lang.String)" resolve="parseDouble" />
                         <ref role="1Pybhc" to="wyt6:~Double" resolve="Double" />
                         <node concept="3tDTZT" id="5XJPBczz8zH" role="37wK5m">
                           <ref role="3tDTNw" node="5XJPBczyDUk" resolve="value" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
index 571a2e12..1716c026 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/jetbrains.mps.baseLanguageExt.test.msd
@@ -24,7 +24,7 @@
     <language slang="l:df345b11-b8c7-4213-ac66-48d2a9b75d88:jetbrains.mps.baseLanguageInternal" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:35320f26-77cb-4c55-be9f-a97a27770af1:jetbrains.mps.logic" version="2" />
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
index fcb8c1f0..d3862cb5 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.types@tests.mps
@@ -7,7 +7,7 @@
     <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="df345b11-b8c7-4213-ac66-48d2a9b75d88" name="jetbrains.mps.baseLanguageInternal" version="0" />
     <use id="35320f26-77cb-4c55-be9f-a97a27770af1" name="jetbrains.mps.logic" version="2" />
@@ -828,7 +828,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="4cvvxaYgWs1" role="2OqNvi">
-                      <ref role="37wK5l" to="mhbf:~SModel.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                      <ref role="37wK5l" to="mhbf:~SModel.getRepository()" resolve="getRepository" />
                     </node>
                   </node>
                 </node>
@@ -5338,7 +5338,7 @@
               <ref role="3cqZAo" node="3KV3FXk0pld" resolve="resultList" />
             </node>
             <node concept="liA8E" id="3KV3FXjZMUC" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~List.isEmpty():boolean" resolve="isEmpty" />
+              <ref role="37wK5l" to="33ny:~List.isEmpty()" resolve="isEmpty" />
             </node>
           </node>
           <node concept="3clFbS" id="3KV3FXjZMUD" role="3clFbx">
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
index 09d2ec4c..594b2242 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds.bad@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
@@ -176,7 +176,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -192,7 +192,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
index acc3dd86..6c839326 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/bounds@tests.mps
@@ -5,7 +5,7 @@
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="8" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="1" />
     <use id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures" version="0" />
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="4" />
@@ -179,7 +179,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -195,7 +195,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
index d8d3a9e9..1069c9d2 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/codeAnal@tests.mps
@@ -8,7 +8,7 @@
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
     <use id="0fda14cc-a416-4c81-869a-2175d8b3325d" name="jetbrains.mps.baseLanguageExt" version="0" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
     <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
   </languages>
@@ -207,7 +207,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -223,7 +223,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps
index e5218427..98b6441e 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features.mps
@@ -475,7 +475,7 @@
               <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="1Py6iKGKdl" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(int):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(int)" resolve="println" />
               <node concept="3cpWs3" id="1Py6iKGU27" role="37wK5m">
                 <node concept="37vLTw" id="1Py6iKGU2L" role="3uHU7w">
                   <ref role="3cqZAo" node="5s5QomKHG9_" resolve="b8" />
@@ -689,7 +689,7 @@
               <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="1Py6iKHgZV" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(int):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(int)" resolve="println" />
               <node concept="3cpWs3" id="1Py6iKHh0s" role="37wK5m">
                 <node concept="3cpWs3" id="1Py6iKHh0t" role="3uHU7B">
                   <node concept="3cpWs3" id="1Py6iKHh0u" role="3uHU7B">
@@ -919,7 +919,7 @@
               <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="3Cu2imBSO9l" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="3cpWs3" id="2HYHa0WD5Ev" role="37wK5m">
                 <node concept="37vLTw" id="2HYHa0WD5EG" role="3uHU7w">
                   <ref role="3cqZAo" node="2HYHa0WBjre" resolve="j" />
@@ -1047,7 +1047,7 @@
               <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="2HYHa0WIw1P" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="3cpWs3" id="2HYHa0WIyAW" role="37wK5m">
                 <node concept="37vLTw" id="2HYHa0WIyPV" role="3uHU7w">
                   <ref role="3cqZAo" node="2HYHa0WIw0y" resolve="e" />
@@ -1177,7 +1177,7 @@
               <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="2HYHa0WUsBR" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="3cpWs3" id="2HYHa0WUuDM" role="37wK5m">
                 <node concept="37vLTw" id="2HYHa0WUuDZ" role="3uHU7w">
                   <ref role="3cqZAo" node="2HYHa0WUot3" resolve="s" />
@@ -1493,7 +1493,7 @@
               <ref role="3cqZAo" node="2HYHa0WUE1q" resolve="a" />
             </node>
             <node concept="liA8E" id="2HYHa0WUEeq" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1531,7 +1531,7 @@
               <ref role="3cqZAo" node="2HYHa0WUEt3" resolve="b" />
             </node>
             <node concept="liA8E" id="2HYHa0WUEE8" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1583,7 +1583,7 @@
               <ref role="3cqZAo" node="2HYHa0WUETz" resolve="c" />
             </node>
             <node concept="liA8E" id="2HYHa0WUF9F" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1631,7 +1631,7 @@
               <ref role="3cqZAo" node="2HYHa0WUFz4" resolve="d" />
             </node>
             <node concept="liA8E" id="2HYHa0WUFOC" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1685,7 +1685,7 @@
               <ref role="3cqZAo" node="70Wv0dIXe9L" resolve="a" />
             </node>
             <node concept="liA8E" id="70Wv0dIXeBL" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1729,7 +1729,7 @@
               <ref role="3cqZAo" node="70Wv0dIXeaZ" resolve="b" />
             </node>
             <node concept="liA8E" id="70Wv0dIXeZr" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1786,7 +1786,7 @@
               <ref role="3cqZAo" node="70Wv0dIXedQ" resolve="c" />
             </node>
             <node concept="liA8E" id="70Wv0dIXfn_" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1839,7 +1839,7 @@
               <ref role="3cqZAo" node="70Wv0dIXfnD" resolve="d" />
             </node>
             <node concept="liA8E" id="70Wv0dIXfRf" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1888,7 +1888,7 @@
               <ref role="3cqZAo" node="70Wv0dJ5qpK" resolve="a" />
             </node>
             <node concept="liA8E" id="70Wv0dJ5qpI" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1926,7 +1926,7 @@
               <ref role="3cqZAo" node="70Wv0dJ5qlg" resolve="b" />
             </node>
             <node concept="liA8E" id="70Wv0dJ5qle" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -1978,7 +1978,7 @@
               <ref role="3cqZAo" node="70Wv0dJ5pNI" resolve="c" />
             </node>
             <node concept="liA8E" id="70Wv0dJ5qk$" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2026,7 +2026,7 @@
               <ref role="3cqZAo" node="70Wv0dJ5qvq" resolve="d" />
             </node>
             <node concept="liA8E" id="70Wv0dJ5qvo" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2080,7 +2080,7 @@
               <ref role="3cqZAo" node="70Wv0dJgAAn" resolve="a" />
             </node>
             <node concept="liA8E" id="70Wv0dJgAA$" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2123,7 +2123,7 @@
               <ref role="3cqZAo" node="70Wv0dJgAAB" resolve="b" />
             </node>
             <node concept="liA8E" id="70Wv0dJgAAO" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2180,7 +2180,7 @@
               <ref role="3cqZAo" node="70Wv0dJgAAR" resolve="c" />
             </node>
             <node concept="liA8E" id="70Wv0dJgAB8" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2233,7 +2233,7 @@
               <ref role="3cqZAo" node="70Wv0dJgABb" resolve="d" />
             </node>
             <node concept="liA8E" id="70Wv0dJgABq" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2276,7 +2276,7 @@
               <ref role="3cqZAo" node="70Wv0dJgFsK" resolve="a" />
             </node>
             <node concept="liA8E" id="70Wv0dJgGcg" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2312,7 +2312,7 @@
               <ref role="3cqZAo" node="6EY0p2xWgfT" resolve="b" />
             </node>
             <node concept="liA8E" id="6EY0p2xWgfR" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2348,7 +2348,7 @@
               <ref role="3cqZAo" node="6EY0p2xWi9x" resolve="c" />
             </node>
             <node concept="liA8E" id="6EY0p2xWi9v" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2409,7 +2409,7 @@
               <ref role="3cqZAo" node="70Wv0dJgMTb" resolve="a" />
             </node>
             <node concept="liA8E" id="70Wv0dJgNKW" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2467,7 +2467,7 @@
               <ref role="3cqZAo" node="70Wv0dJgNRg" resolve="b" />
             </node>
             <node concept="liA8E" id="70Wv0dJgNRe" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2521,7 +2521,7 @@
               <ref role="3cqZAo" node="6EY0p2wscxb" resolve="c" />
             </node>
             <node concept="liA8E" id="6EY0p2wscx9" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2583,7 +2583,7 @@
               <ref role="3cqZAo" node="6EY0p2wscLO" resolve="d" />
             </node>
             <node concept="liA8E" id="6EY0p2wscLM" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2657,7 +2657,7 @@
               <ref role="3cqZAo" node="6EY0p2wscZw" resolve="e" />
             </node>
             <node concept="liA8E" id="6EY0p2wscZu" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2709,7 +2709,7 @@
               <ref role="3cqZAo" node="6EY0p2wsdjW" resolve="f" />
             </node>
             <node concept="liA8E" id="6EY0p2wsdjU" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -2767,7 +2767,7 @@
               <ref role="3cqZAo" node="6EY0p2wshVK" resolve="g" />
             </node>
             <node concept="liA8E" id="6EY0p2wshVI" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
             </node>
           </node>
         </node>
@@ -3821,7 +3821,7 @@
               <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="6EY0p2ylE1g" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println():void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println()" resolve="println" />
               <node concept="3cpWs3" id="6EY0p2ylIhm" role="37wK5m">
                 <node concept="37vLTw" id="6EY0p2ylIi0" role="3uHU7w">
                   <ref role="3cqZAo" node="6EY0p2ylwbu" resolve="b8" />
@@ -4031,7 +4031,7 @@
               <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="6EY0p2ylTSL" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println():void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println()" resolve="println" />
               <node concept="3cpWs3" id="6EY0p2ylW7t" role="37wK5m">
                 <node concept="37vLTw" id="6EY0p2ylW7R" role="3uHU7w">
                   <ref role="3cqZAo" node="6EY0p2ylTSs" resolve="you" />
@@ -7371,7 +7371,7 @@
               <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="5XJPBczXwKJ" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
               <node concept="2ShNRf" id="5XJPBczXwNH" role="37wK5m">
                 <node concept="3g6Rrh" id="5XJPBczXBf7" role="2ShVmc">
                   <node concept="10P55v" id="5XJPBczX$1l" role="3g7fb8" />
@@ -7823,7 +7823,7 @@
               <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
             </node>
             <node concept="liA8E" id="7AyqXCd$XW4" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.Object)" resolve="println" />
               <node concept="2ShNRf" id="7AyqXCd$XW5" role="37wK5m">
                 <node concept="3g6Rrh" id="7AyqXCd$XW6" role="2ShVmc">
                   <node concept="3uibUv" id="7AyqXCd$Yta" role="3g7fb8">
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps
index c9e42cf8..9f365271 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/features@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
@@ -179,7 +179,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -195,7 +195,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
index be7a165c..4649b6fb 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/helloWorld@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
@@ -178,7 +178,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -194,7 +194,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
index 18c7c92a..6830f991 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/simpleGenerics@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
@@ -178,7 +178,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -194,7 +194,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
index 09459485..06892f2c 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/slice@tests.mps
@@ -4,7 +4,7 @@
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="2" />
     <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
-    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="13" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="15" />
     <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
   </languages>
   <imports>
@@ -178,7 +178,7 @@
                         <node concept="2OqwBi" id="35YJGAJT$3b" role="Vysub">
                           <node concept="1jxXqW" id="35YJGAJT$3c" role="2Oq$k0" />
                           <node concept="liA8E" id="35YJGAJT$3d" role="2OqNvi">
-                            <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+                            <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
                           </node>
                         </node>
                       </node>
@@ -194,7 +194,7 @@
           <node concept="2OqwBi" id="35YJGAJTxW6" role="ukAjM">
             <node concept="1jxXqW" id="35YJGAJTxLs" role="2Oq$k0" />
             <node concept="liA8E" id="35YJGAJTy_W" role="2OqNvi">
-              <ref role="37wK5l" to="z1c3:~Project.getRepository():org.jetbrains.mps.openapi.module.SRepository" resolve="getRepository" />
+              <ref role="37wK5l" to="z1c3:~Project.getRepository()" resolve="getRepository" />
             </node>
           </node>
         </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.mps
index 22b1d20e..9d85393e 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.codeAnal.mps
@@ -742,14 +742,14 @@
                       <ref role="3VsUkX" to="z60i:~AWTEvent" resolve="AWTEvent" />
                     </node>
                     <node concept="liA8E" id="3489cc5$lxB" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Class.getField(java.lang.String):java.lang.reflect.Field" resolve="getField" />
+                      <ref role="37wK5l" to="wyt6:~Class.getField(java.lang.String)" resolve="getField" />
                       <node concept="Xl_RD" id="3489cc5$lxC" role="37wK5m">
                         <property role="Xl_RC" value="MOUSE_WHEEL_EVENT_MASK" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="3489cc5$lxD" role="2OqNvi">
-                    <ref role="37wK5l" to="t6h5:~Field.getLong(java.lang.Object):long" resolve="getLong" />
+                    <ref role="37wK5l" to="t6h5:~Field.getLong(java.lang.Object)" resolve="getLong" />
                     <node concept="10Nm6u" id="3489cc5$lxE" role="37wK5m" />
                   </node>
                 </node>
@@ -766,14 +766,14 @@
                       <ref role="3VsUkX" to="hyam:~MouseEvent" resolve="MouseEvent" />
                     </node>
                     <node concept="liA8E" id="3489cc5$lxM" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~Class.getField(java.lang.String):java.lang.reflect.Field" resolve="getField" />
+                      <ref role="37wK5l" to="wyt6:~Class.getField(java.lang.String)" resolve="getField" />
                       <node concept="Xl_RD" id="3489cc5$lxN" role="37wK5m">
                         <property role="Xl_RC" value="MOUSE_WHEEL" />
                       </node>
                     </node>
                   </node>
                   <node concept="liA8E" id="3489cc5$lxO" role="2OqNvi">
-                    <ref role="37wK5l" to="t6h5:~Field.getInt(java.lang.Object):int" resolve="getInt" />
+                    <ref role="37wK5l" to="t6h5:~Field.getInt(java.lang.Object)" resolve="getInt" />
                     <node concept="10Nm6u" id="3489cc5$lxP" role="37wK5m" />
                   </node>
                 </node>
@@ -822,10 +822,10 @@
                   <node concept="2OqwBi" id="3489cc5$ly9" role="3clFbG">
                     <node concept="2OqwBi" id="3489cc5$lya" role="2Oq$k0">
                       <node concept="1rXfSq" id="3489cc5$lyb" role="2Oq$k0">
-                        <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                        <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                       </node>
                       <node concept="liA8E" id="3489cc5$lyc" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Class.getMethod(java.lang.String,java.lang.Class...):java.lang.reflect.Method" resolve="getMethod" />
+                        <ref role="37wK5l" to="wyt6:~Class.getMethod(java.lang.String,java.lang.Class...)" resolve="getMethod" />
                         <node concept="Xl_RD" id="3489cc5$lyd" role="37wK5m">
                           <property role="Xl_RC" value="setFocusTraversalKeysEnabled" />
                         </node>
@@ -843,7 +843,7 @@
                       </node>
                     </node>
                     <node concept="liA8E" id="3489cc5$lyi" role="2OqNvi">
-                      <ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...):java.lang.Object" resolve="invoke" />
+                      <ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...)" resolve="invoke" />
                       <node concept="Xjq3P" id="3489cc5$lyj" role="37wK5m" />
                       <node concept="2ShNRf" id="3489cc5$lyn" role="37wK5m">
                         <node concept="3g6Rrh" id="3489cc5$lym" role="2ShVmc">
@@ -865,7 +865,7 @@
         </node>
         <node concept="3clFbF" id="3489cc5$lyv" role="3cqZAp">
           <node concept="1rXfSq" id="3489cc5$lyw" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Component.enableEvents(long):void" resolve="enableEvents" />
+            <ref role="37wK5l" to="z60i:~Component.enableEvents(long)" resolve="enableEvents" />
             <node concept="pVOtf" id="3489cc5$lyx" role="37wK5m">
               <node concept="pVOtf" id="3489cc5$lyy" role="3uHU7B">
                 <node concept="pVOtf" id="3489cc5$lyz" role="3uHU7B">
@@ -1132,7 +1132,7 @@
                 <ref role="3cqZAo" node="3489cc5$luT" resolve="c_bg" />
               </node>
               <node concept="liA8E" id="3489cc5$shy" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~Color.getRed():int" resolve="getRed" />
+                <ref role="37wK5l" to="z60i:~Color.getRed()" resolve="getRed" />
               </node>
             </node>
           </node>
@@ -1147,7 +1147,7 @@
                 <ref role="3cqZAo" node="3489cc5$lvh" resolve="c_press" />
               </node>
               <node concept="liA8E" id="3489cc5$shA" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~Color.getRed():int" resolve="getRed" />
+                <ref role="37wK5l" to="z60i:~Color.getRed()" resolve="getRed" />
               </node>
             </node>
           </node>
@@ -1162,7 +1162,7 @@
                 <ref role="3cqZAo" node="3489cc5$luT" resolve="c_bg" />
               </node>
               <node concept="liA8E" id="3489cc5$shE" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~Color.getGreen():int" resolve="getGreen" />
+                <ref role="37wK5l" to="z60i:~Color.getGreen()" resolve="getGreen" />
               </node>
             </node>
           </node>
@@ -1177,7 +1177,7 @@
                 <ref role="3cqZAo" node="3489cc5$lvh" resolve="c_press" />
               </node>
               <node concept="liA8E" id="3489cc5$shI" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~Color.getGreen():int" resolve="getGreen" />
+                <ref role="37wK5l" to="z60i:~Color.getGreen()" resolve="getGreen" />
               </node>
             </node>
           </node>
@@ -1192,7 +1192,7 @@
                 <ref role="3cqZAo" node="3489cc5$luT" resolve="c_bg" />
               </node>
               <node concept="liA8E" id="3489cc5$shM" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~Color.getBlue():int" resolve="getBlue" />
+                <ref role="37wK5l" to="z60i:~Color.getBlue()" resolve="getBlue" />
               </node>
             </node>
           </node>
@@ -1207,7 +1207,7 @@
                 <ref role="3cqZAo" node="3489cc5$lvh" resolve="c_press" />
               </node>
               <node concept="liA8E" id="3489cc5$shQ" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~Color.getBlue():int" resolve="getBlue" />
+                <ref role="37wK5l" to="z60i:~Color.getBlue()" resolve="getBlue" />
               </node>
             </node>
           </node>
@@ -1440,7 +1440,7 @@
               <ref role="3cqZAo" node="3489cc5$lvA" resolve="gradient" />
             </node>
             <node concept="1rXfSq" id="3489cc5$lKc" role="37vLTx">
-              <ref role="37wK5l" to="z60i:~Component.createImage(java.awt.image.ImageProducer):java.awt.Image" resolve="createImage" />
+              <ref role="37wK5l" to="z60i:~Component.createImage(java.awt.image.ImageProducer)" resolve="createImage" />
               <node concept="2ShNRf" id="3489cc5$shR" role="37wK5m">
                 <node concept="1pGfFk" id="3489cc5$shS" role="2ShVmc">
                   <ref role="37wK5l" to="jan3:~MemoryImageSource.&lt;init&gt;(int,int,int[],int,int)" resolve="MemoryImageSource" />
@@ -1499,13 +1499,13 @@
             </node>
             <node concept="2OqwBi" id="3489cc5$lKt" role="37vLTx">
               <node concept="1rXfSq" id="3489cc5$lKu" role="2Oq$k0">
-                <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font):java.awt.FontMetrics" resolve="getFontMetrics" />
+                <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
                 <node concept="37vLTw" id="3489cc5$lKv" role="37wK5m">
                   <ref role="3cqZAo" node="3489cc5$lKn" resolve="font" />
                 </node>
               </node>
               <node concept="liA8E" id="3489cc5$lKw" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~FontMetrics.getHeight():int" resolve="getHeight" />
+                <ref role="37wK5l" to="z60i:~FontMetrics.getHeight()" resolve="getHeight" />
               </node>
             </node>
           </node>
@@ -1517,7 +1517,7 @@
         </node>
         <node concept="3clFbF" id="3489cc5$lKx" role="3cqZAp">
           <node concept="3nyPlj" id="3489cc5$lKy" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Container.setFont(java.awt.Font):void" resolve="setFont" />
+            <ref role="37wK5l" to="z60i:~Container.setFont(java.awt.Font)" resolve="setFont" />
             <node concept="37vLTw" id="3489cc5$lKz" role="37wK5m">
               <ref role="3cqZAo" node="3489cc5$lKn" resolve="font" />
             </node>
@@ -1795,7 +1795,7 @@
                                         </node>
                                       </node>
                                       <node concept="liA8E" id="3489cc5$mdY" role="2OqNvi">
-                                        <ref role="37wK5l" to="z60i:~Component.setBounds(java.awt.Rectangle):void" resolve="setBounds" />
+                                        <ref role="37wK5l" to="z60i:~Component.setBounds(java.awt.Rectangle)" resolve="setBounds" />
                                         <node concept="37vLTw" id="3489cc5$mdZ" role="37wK5m">
                                           <ref role="3cqZAo" node="3489cc5$mdK" resolve="r" />
                                         </node>
@@ -2067,7 +2067,7 @@
                                             </node>
                                             <node concept="2YIFZM" id="3489cc5$sic" role="37vLTx">
                                               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                               <node concept="37vLTw" id="3489cc5$mbX" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$lvy" resolve="block" />
                                               </node>
@@ -2129,7 +2129,7 @@
                                         </node>
                                         <node concept="2YIFZM" id="3489cc5$siq" role="37vLTx">
                                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                           <node concept="37vLTw" id="3489cc5$mcn" role="37wK5m">
                                             <ref role="3cqZAo" node="3489cc5$maE" resolve="pw" />
                                           </node>
@@ -2285,7 +2285,7 @@
                                               </node>
                                               <node concept="2YIFZM" id="3489cc5$siS" role="37vLTx">
                                                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                                <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                                 <node concept="2OqwBi" id="3489cc5$siV" role="37wK5m">
                                                   <node concept="37vLTw" id="3489cc5$siU" role="2Oq$k0">
                                                     <ref role="3cqZAo" node="3489cc5$mct" resolve="r" />
@@ -2387,7 +2387,7 @@
                                         </node>
                                         <node concept="2YIFZM" id="3489cc5$sjq" role="37vLTx">
                                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                          <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                          <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                           <node concept="2OqwBi" id="3489cc5$sjt" role="37wK5m">
                                             <node concept="37vLTw" id="3489cc5$sjs" role="2Oq$k0">
                                               <ref role="3cqZAo" node="3489cc5$mct" resolve="r" />
@@ -2708,7 +2708,7 @@
                                         </node>
                                         <node concept="2YIFZM" id="3489cc5$sjO" role="37vLTx">
                                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                           <node concept="37vLTw" id="3489cc5$m64" role="37wK5m">
                                             <ref role="3cqZAo" node="3489cc5$m5l" resolve="columnheight" />
                                           </node>
@@ -2951,7 +2951,7 @@
                                           </node>
                                           <node concept="2YIFZM" id="3489cc5$sk2" role="37vLTx">
                                             <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                            <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                            <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                             <node concept="37vLTw" id="3489cc5$m86" role="37wK5m">
                                               <ref role="3cqZAo" node="3489cc5$m5h" resolve="width" />
                                             </node>
@@ -3053,7 +3053,7 @@
                                             </node>
                                             <node concept="2YIFZM" id="3489cc5$sk8" role="37vLTx">
                                               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                               <node concept="37vLTw" id="3489cc5$m7v" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$m6N" resolve="iheight" />
                                               </node>
@@ -3548,7 +3548,7 @@
                                   </node>
                                   <node concept="2YIFZM" id="3489cc5$sku" role="37vLTx">
                                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                    <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                    <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                     <node concept="37vLTw" id="3489cc5$m3k" role="37wK5m">
                                       <ref role="3cqZAo" node="3489cc5$m2W" resolve="d1" />
                                     </node>
@@ -4041,7 +4041,7 @@
                                       </node>
                                       <node concept="2YIFZM" id="3489cc5$sl0" role="37wK5m">
                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                        <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                        <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                         <node concept="3cmrfG" id="3489cc5$m0X" role="37wK5m">
                                           <property role="3cmrfH" value="0" />
                                         </node>
@@ -4073,7 +4073,7 @@
                                       </node>
                                       <node concept="2YIFZM" id="3489cc5$sla" role="37wK5m">
                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                        <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                        <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                         <node concept="3cmrfG" id="3489cc5$m15" role="37wK5m">
                                           <property role="3cmrfH" value="0" />
                                         </node>
@@ -4105,7 +4105,7 @@
                                       </node>
                                       <node concept="2YIFZM" id="3489cc5$slk" role="37wK5m">
                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                         <node concept="2OqwBi" id="3489cc5$sln" role="37wK5m">
                                           <node concept="37vLTw" id="3489cc5$slm" role="2Oq$k0">
                                             <ref role="3cqZAo" node="3489cc5$m0H" resolve="d" />
@@ -4125,7 +4125,7 @@
                                       </node>
                                       <node concept="2YIFZM" id="3489cc5$slu" role="37wK5m">
                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                         <node concept="2OqwBi" id="3489cc5$slx" role="37wK5m">
                                           <node concept="37vLTw" id="3489cc5$slw" role="2Oq$k0">
                                             <ref role="3cqZAo" node="3489cc5$m0H" resolve="d" />
@@ -5030,7 +5030,7 @@
                                         <node concept="10Oyi0" id="3489cc5$lYI" role="1tU5fm" />
                                         <node concept="2YIFZM" id="3489cc5$slK" role="33vP2m">
                                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                           <node concept="3cmrfG" id="3489cc5$lYK" role="37wK5m">
                                             <property role="3cmrfH" value="0" />
                                           </node>
@@ -5128,7 +5128,7 @@
                                         <node concept="10Oyi0" id="3489cc5$lZm" role="1tU5fm" />
                                         <node concept="2YIFZM" id="3489cc5$slQ" role="33vP2m">
                                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                           <node concept="3cmrfG" id="3489cc5$lZo" role="37wK5m">
                                             <property role="3cmrfH" value="0" />
                                           </node>
@@ -5492,7 +5492,7 @@
                           </node>
                           <node concept="2YIFZM" id="3489cc5$smc" role="37vLTx">
                             <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                            <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                            <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                             <node concept="37vLTw" id="3489cc5$lQ$" role="37wK5m">
                               <ref role="3cqZAo" node="3489cc5$lPH" resolve="tabsize" />
                             </node>
@@ -5976,7 +5976,7 @@
                         <ref role="3cqZAo" node="3489cc5$lMi" resolve="text" />
                       </node>
                       <node concept="liA8E" id="3489cc5$smS" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                        <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                       </node>
                     </node>
                   </node>
@@ -5999,7 +5999,7 @@
                               <ref role="3cqZAo" node="3489cc5$lMi" resolve="text" />
                             </node>
                             <node concept="liA8E" id="3489cc5$smW" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                              <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                             </node>
                           </node>
                         </node>
@@ -6039,7 +6039,7 @@
                         <ref role="3cqZAo" node="3489cc5$lMi" resolve="text" />
                       </node>
                       <node concept="liA8E" id="3489cc5$sn0" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                        <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                       </node>
                     </node>
                   </node>
@@ -6062,7 +6062,7 @@
                               <ref role="3cqZAo" node="3489cc5$lMi" resolve="text" />
                             </node>
                             <node concept="liA8E" id="3489cc5$sn4" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                              <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                             </node>
                           </node>
                         </node>
@@ -6101,9 +6101,9 @@
                       <ref role="3uigEE" to="z60i:~FontMetrics" resolve="FontMetrics" />
                     </node>
                     <node concept="1rXfSq" id="3489cc5$lNe" role="33vP2m">
-                      <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font):java.awt.FontMetrics" resolve="getFontMetrics" />
+                      <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
                       <node concept="1rXfSq" id="3489cc5$lNf" role="37wK5m">
-                        <ref role="37wK5l" to="z60i:~Component.getFont():java.awt.Font" resolve="getFont" />
+                        <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
                       </node>
                     </node>
                   </node>
@@ -6183,7 +6183,7 @@
                             <ref role="3cqZAo" node="3489cc5$lMi" resolve="text" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sn8" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.indexOf(int,int):int" resolve="indexOf" />
+                            <ref role="37wK5l" to="wyt6:~String.indexOf(int,int)" resolve="indexOf" />
                             <node concept="1Xhbcc" id="3489cc5$lNM" role="37wK5m">
                               <property role="1XhdNS" value="\n" />
                             </node>
@@ -6234,7 +6234,7 @@
                                   <ref role="3cqZAo" node="3489cc5$lMi" resolve="text" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$snc" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                  <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                   <node concept="37vLTw" id="3489cc5$lO3" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$lNp" resolve="i" />
                                   </node>
@@ -6248,7 +6248,7 @@
                                   <ref role="3cqZAo" node="3489cc5$lMi" resolve="text" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$sng" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.substring(int):java.lang.String" resolve="substring" />
+                                  <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
                                   <node concept="37vLTw" id="3489cc5$lO6" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$lNp" resolve="i" />
                                   </node>
@@ -6269,7 +6269,7 @@
                             </node>
                             <node concept="2YIFZM" id="3489cc5$sni" role="37vLTx">
                               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                               <node concept="37vLTw" id="3489cc5$lOc" role="37wK5m">
                                 <ref role="3cqZAo" node="3489cc5$lNg" resolve="width" />
                               </node>
@@ -6278,7 +6278,7 @@
                                   <ref role="3cqZAo" node="3489cc5$lNb" resolve="fm" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$snm" role="2OqNvi">
-                                  <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                                  <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                                   <node concept="37vLTw" id="3489cc5$lOe" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$lNU" resolve="line" />
                                   </node>
@@ -6349,13 +6349,13 @@
                                 <ref role="3cqZAo" node="3489cc5$lNb" resolve="fm" />
                               </node>
                               <node concept="liA8E" id="3489cc5$snq" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                                <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                                 <node concept="2OqwBi" id="3489cc5$snt" role="37wK5m">
                                   <node concept="37vLTw" id="3489cc5$sns" role="2Oq$k0">
                                     <ref role="3cqZAo" node="3489cc5$lMi" resolve="text" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$snu" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                    <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                     <node concept="37vLTw" id="3489cc5$lOB" role="37wK5m">
                                       <ref role="3cqZAo" node="3489cc5$lNp" resolve="i" />
                                     </node>
@@ -6400,7 +6400,7 @@
                             <ref role="3cqZAo" node="3489cc5$lNb" resolve="fm" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sny" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~FontMetrics.getHeight():int" resolve="getHeight" />
+                            <ref role="37wK5l" to="z60i:~FontMetrics.getHeight()" resolve="getHeight" />
                           </node>
                         </node>
                       </node>
@@ -6431,7 +6431,7 @@
                             <ref role="3cqZAo" node="3489cc5$lNb" resolve="fm" />
                           </node>
                           <node concept="liA8E" id="3489cc5$snA" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~FontMetrics.getLeading():int" resolve="getLeading" />
+                            <ref role="37wK5l" to="z60i:~FontMetrics.getLeading()" resolve="getLeading" />
                           </node>
                         </node>
                       </node>
@@ -6469,7 +6469,7 @@
                             <ref role="3cqZAo" node="3489cc5$lNb" resolve="fm" />
                           </node>
                           <node concept="liA8E" id="3489cc5$snE" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~FontMetrics.getAscent():int" resolve="getAscent" />
+                            <ref role="37wK5l" to="z60i:~FontMetrics.getAscent()" resolve="getAscent" />
                           </node>
                         </node>
                         <node concept="2OqwBi" id="3489cc5$snH" role="3uHU7w">
@@ -6477,7 +6477,7 @@
                             <ref role="3cqZAo" node="3489cc5$lNb" resolve="fm" />
                           </node>
                           <node concept="liA8E" id="3489cc5$snI" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~FontMetrics.getDescent():int" resolve="getDescent" />
+                            <ref role="37wK5l" to="z60i:~FontMetrics.getDescent()" resolve="getDescent" />
                           </node>
                         </node>
                       </node>
@@ -6681,7 +6681,7 @@
                           <ref role="3cqZAo" node="3489cc5$lKX" resolve="icon" />
                         </node>
                         <node concept="liA8E" id="3489cc5$snM" role="2OqNvi">
-                          <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver):int" resolve="getWidth" />
+                          <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver)" resolve="getWidth" />
                           <node concept="Xjq3P" id="3489cc5$lLe" role="37wK5m" />
                         </node>
                       </node>
@@ -7581,7 +7581,7 @@
                     <ref role="3cqZAo" node="3489cc5$miL" resolve="text" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sok" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                    <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                   </node>
                 </node>
                 <node concept="3cmrfG" id="3489cc5$mj2" role="37wK5m">
@@ -8187,9 +8187,9 @@
                   <ref role="3uigEE" to="z60i:~FontMetrics" resolve="FontMetrics" />
                 </node>
                 <node concept="1rXfSq" id="3489cc5$mmJ" role="33vP2m">
-                  <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font):java.awt.FontMetrics" resolve="getFontMetrics" />
+                  <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
                   <node concept="1rXfSq" id="3489cc5$mmK" role="37wK5m">
-                    <ref role="37wK5l" to="z60i:~Component.getFont():java.awt.Font" resolve="getFont" />
+                    <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
                   </node>
                 </node>
               </node>
@@ -8205,7 +8205,7 @@
                       <ref role="3cqZAo" node="3489cc5$mmG" resolve="fm" />
                     </node>
                     <node concept="liA8E" id="3489cc5$soq" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                      <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                       <node concept="37vLTw" id="3489cc5$mmQ" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$mlk" resolve="text" />
                       </node>
@@ -8229,7 +8229,7 @@
                         <ref role="3cqZAo" node="3489cc5$mmG" resolve="fm" />
                       </node>
                       <node concept="liA8E" id="3489cc5$sou" role="2OqNvi">
-                        <ref role="37wK5l" to="z60i:~FontMetrics.getAscent():int" resolve="getAscent" />
+                        <ref role="37wK5l" to="z60i:~FontMetrics.getAscent()" resolve="getAscent" />
                       </node>
                     </node>
                     <node concept="2OqwBi" id="3489cc5$sox" role="3uHU7w">
@@ -8237,7 +8237,7 @@
                         <ref role="3cqZAo" node="3489cc5$mmG" resolve="fm" />
                       </node>
                       <node concept="liA8E" id="3489cc5$soy" role="2OqNvi">
-                        <ref role="37wK5l" to="z60i:~FontMetrics.getDescent():int" resolve="getDescent" />
+                        <ref role="37wK5l" to="z60i:~FontMetrics.getDescent()" resolve="getDescent" />
                       </node>
                     </node>
                   </node>
@@ -8302,7 +8302,7 @@
             </node>
             <node concept="3clFbF" id="3489cc5$mnm" role="3cqZAp">
               <node concept="1rXfSq" id="3489cc5$mnn" role="3clFbG">
-                <ref role="37wK5l" to="z60i:~Component.repaint(int,int,int,int):void" resolve="repaint" />
+                <ref role="37wK5l" to="z60i:~Component.repaint(int,int,int,int)" resolve="repaint" />
                 <node concept="3cpWs3" id="3489cc5$mno" role="37wK5m">
                   <node concept="37vLTw" id="3489cc5$mnp" role="3uHU7B">
                     <ref role="3cqZAo" node="3489cc5$lwG" resolve="mousex" />
@@ -8393,7 +8393,7 @@
             </node>
             <node concept="3clFbF" id="3489cc5$mnU" role="3cqZAp">
               <node concept="1rXfSq" id="3489cc5$mnV" role="3clFbG">
-                <ref role="37wK5l" to="z60i:~Component.repaint(int,int,int,int):void" resolve="repaint" />
+                <ref role="37wK5l" to="z60i:~Component.repaint(int,int,int,int)" resolve="repaint" />
                 <node concept="2OqwBi" id="3489cc5$so_" role="37wK5m">
                   <node concept="37vLTw" id="3489cc5$so$" role="2Oq$k0">
                     <ref role="3cqZAo" node="3489cc5$mnF" resolve="bounds" />
@@ -8549,7 +8549,7 @@
                 <ref role="3cqZAo" node="3489cc5$mop" resolve="text" />
               </node>
               <node concept="liA8E" id="3489cc5$soQ" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
               </node>
             </node>
           </node>
@@ -8572,7 +8572,7 @@
                       <ref role="3cqZAo" node="3489cc5$mop" resolve="text" />
                     </node>
                     <node concept="liA8E" id="3489cc5$soU" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                      <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                     </node>
                   </node>
                 </node>
@@ -8612,7 +8612,7 @@
                 <ref role="3cqZAo" node="3489cc5$mop" resolve="text" />
               </node>
               <node concept="liA8E" id="3489cc5$soY" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
               </node>
             </node>
           </node>
@@ -8635,7 +8635,7 @@
                       <ref role="3cqZAo" node="3489cc5$mop" resolve="text" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sp2" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                      <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                     </node>
                   </node>
                 </node>
@@ -8683,9 +8683,9 @@
               <ref role="3uigEE" to="z60i:~FontMetrics" resolve="FontMetrics" />
             </node>
             <node concept="1rXfSq" id="3489cc5$mpo" role="33vP2m">
-              <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font):java.awt.FontMetrics" resolve="getFontMetrics" />
+              <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
               <node concept="1rXfSq" id="3489cc5$mpp" role="37wK5m">
-                <ref role="37wK5l" to="z60i:~Component.getFont():java.awt.Font" resolve="getFont" />
+                <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
               </node>
             </node>
           </node>
@@ -8706,7 +8706,7 @@
                       <ref role="3cqZAo" node="3489cc5$mpl" resolve="fm" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sp6" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char):int" resolve="charWidth" />
+                      <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char)" resolve="charWidth" />
                       <node concept="1Xhbcc" id="3489cc5$mpw" role="37wK5m">
                         <property role="1XhdNS" value="*" />
                       </node>
@@ -8722,13 +8722,13 @@
                   <ref role="3cqZAo" node="3489cc5$mpl" resolve="fm" />
                 </node>
                 <node concept="liA8E" id="3489cc5$spa" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                  <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                   <node concept="2OqwBi" id="3489cc5$spd" role="37wK5m">
                     <node concept="37vLTw" id="3489cc5$spc" role="2Oq$k0">
                       <ref role="3cqZAo" node="3489cc5$mop" resolve="text" />
                     </node>
                     <node concept="liA8E" id="3489cc5$spe" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                      <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                       <node concept="3cmrfG" id="3489cc5$mp_" role="37wK5m">
                         <property role="3cmrfH" value="0" />
                       </node>
@@ -8823,13 +8823,13 @@
             </node>
             <node concept="2YIFZM" id="3489cc5$spg" role="37vLTx">
               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
               <node concept="3cmrfG" id="3489cc5$mq8" role="37wK5m">
                 <property role="3cmrfH" value="0" />
               </node>
               <node concept="2YIFZM" id="3489cc5$spi" role="37wK5m">
                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                 <node concept="37vLTw" id="3489cc5$mqa" role="37wK5m">
                   <ref role="3cqZAo" node="3489cc5$mph" resolve="off" />
                 </node>
@@ -8847,7 +8847,7 @@
                                 <ref role="3cqZAo" node="3489cc5$mpl" resolve="fm" />
                               </node>
                               <node concept="liA8E" id="3489cc5$spm" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char):int" resolve="charWidth" />
+                                <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char)" resolve="charWidth" />
                                 <node concept="1Xhbcc" id="3489cc5$mqg" role="37wK5m">
                                   <property role="1XhdNS" value="*" />
                                 </node>
@@ -8858,7 +8858,7 @@
                                 <ref role="3cqZAo" node="3489cc5$mop" resolve="text" />
                               </node>
                               <node concept="liA8E" id="3489cc5$spq" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                               </node>
                             </node>
                           </node>
@@ -8868,7 +8868,7 @@
                             <ref role="3cqZAo" node="3489cc5$mpl" resolve="fm" />
                           </node>
                           <node concept="liA8E" id="3489cc5$spu" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                            <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                             <node concept="37vLTw" id="3489cc5$mqk" role="37wK5m">
                               <ref role="3cqZAo" node="3489cc5$mop" resolve="text" />
                             </node>
@@ -9294,13 +9294,13 @@
               </node>
               <node concept="2YIFZM" id="3489cc5$spS" role="3K4E3e">
                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                 <node concept="3cmrfG" id="3489cc5$msG" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                 </node>
                 <node concept="2YIFZM" id="3489cc5$spU" role="37wK5m">
                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                  <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                  <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                   <node concept="2OqwBi" id="3489cc5$spX" role="37wK5m">
                     <node concept="37vLTw" id="3489cc5$spW" role="2Oq$k0">
                       <ref role="3cqZAo" node="3489cc5$mst" resolve="view" />
@@ -9339,13 +9339,13 @@
               </node>
               <node concept="2YIFZM" id="3489cc5$sq0" role="3K4E3e">
                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                 <node concept="3cmrfG" id="3489cc5$msV" role="37wK5m">
                   <property role="3cmrfH" value="0" />
                 </node>
                 <node concept="2YIFZM" id="3489cc5$sq2" role="37wK5m">
                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                  <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                  <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                   <node concept="2OqwBi" id="3489cc5$sq5" role="37wK5m">
                     <node concept="37vLTw" id="3489cc5$sq4" role="2Oq$k0">
                       <ref role="3cqZAo" node="3489cc5$mst" resolve="view" />
@@ -9375,7 +9375,7 @@
             </node>
             <node concept="2YIFZM" id="3489cc5$sq8" role="37wK5m">
               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
               <node concept="3cpWsd" id="3489cc5$mt6" role="37wK5m">
                 <node concept="37vLTw" id="3489cc5$mt7" role="3uHU7B">
                   <ref role="3cqZAo" node="3489cc5$mrX" resolve="viewportwidth" />
@@ -9390,7 +9390,7 @@
             </node>
             <node concept="2YIFZM" id="3489cc5$sqa" role="37wK5m">
               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
               <node concept="3cpWsd" id="3489cc5$mtb" role="37wK5m">
                 <node concept="37vLTw" id="3489cc5$mtc" role="3uHU7B">
                   <ref role="3cqZAo" node="3489cc5$ms9" resolve="viewportheight" />
@@ -9491,7 +9491,7 @@
             <node concept="10Oyi0" id="3489cc5$mtG" role="1tU5fm" />
             <node concept="2YIFZM" id="3489cc5$sqc" role="33vP2m">
               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
               <node concept="3cpWs3" id="3489cc5$mtI" role="37wK5m">
                 <node concept="3cpWsd" id="3489cc5$mtJ" role="3uHU7B">
                   <node concept="3cpWs3" id="3489cc5$mtK" role="3uHU7B">
@@ -9517,7 +9517,7 @@
               </node>
               <node concept="2YIFZM" id="3489cc5$sqi" role="37wK5m">
                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                 <node concept="2OqwBi" id="3489cc5$sql" role="37wK5m">
                   <node concept="37vLTw" id="3489cc5$sqk" role="2Oq$k0">
                     <ref role="3cqZAo" node="3489cc5$mtu" resolve="view" />
@@ -9540,7 +9540,7 @@
             <node concept="10Oyi0" id="3489cc5$mtU" role="1tU5fm" />
             <node concept="2YIFZM" id="3489cc5$sqo" role="33vP2m">
               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
               <node concept="3cpWs3" id="3489cc5$mtW" role="37wK5m">
                 <node concept="3cpWsd" id="3489cc5$mtX" role="3uHU7B">
                   <node concept="3cpWs3" id="3489cc5$mtY" role="3uHU7B">
@@ -9566,7 +9566,7 @@
               </node>
               <node concept="2YIFZM" id="3489cc5$squ" role="37wK5m">
                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                 <node concept="2OqwBi" id="3489cc5$sqx" role="37wK5m">
                   <node concept="37vLTw" id="3489cc5$sqw" role="2Oq$k0">
                     <ref role="3cqZAo" node="3489cc5$mtu" resolve="view" />
@@ -9941,7 +9941,7 @@
                 </node>
                 <node concept="2YIFZM" id="3489cc5$sr2" role="37vLTx">
                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                  <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                  <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                   <node concept="37vLTw" id="3489cc5$mw1" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$lvy" resolve="block" />
                   </node>
@@ -10123,7 +10123,7 @@
                             <ref role="3cqZAo" node="3489cc5$mwn" resolve="icon" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sre" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver):int" resolve="getWidth" />
+                            <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver)" resolve="getWidth" />
                             <node concept="Xjq3P" id="3489cc5$mwC" role="37wK5m" />
                           </node>
                         </node>
@@ -10141,7 +10141,7 @@
                         </node>
                         <node concept="2YIFZM" id="3489cc5$srk" role="37vLTx">
                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                          <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                          <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                           <node concept="2OqwBi" id="3489cc5$srn" role="37wK5m">
                             <node concept="37vLTw" id="3489cc5$srm" role="2Oq$k0">
                               <ref role="3cqZAo" node="3489cc5$mwi" resolve="size" />
@@ -10156,7 +10156,7 @@
                                 <ref role="3cqZAo" node="3489cc5$mwn" resolve="icon" />
                               </node>
                               <node concept="liA8E" id="3489cc5$srs" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~Image.getHeight(java.awt.image.ImageObserver):int" resolve="getHeight" />
+                                <ref role="37wK5l" to="z60i:~Image.getHeight(java.awt.image.ImageObserver)" resolve="getHeight" />
                                 <node concept="Xjq3P" id="3489cc5$mwK" role="37wK5m" />
                               </node>
                             </node>
@@ -10288,9 +10288,9 @@
                   <ref role="3uigEE" to="z60i:~FontMetrics" resolve="FontMetrics" />
                 </node>
                 <node concept="1rXfSq" id="3489cc5$mxW" role="33vP2m">
-                  <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font):java.awt.FontMetrics" resolve="getFontMetrics" />
+                  <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
                   <node concept="1rXfSq" id="3489cc5$mxX" role="37wK5m">
-                    <ref role="37wK5l" to="z60i:~Component.getFont():java.awt.Font" resolve="getFont" />
+                    <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
                   </node>
                 </node>
               </node>
@@ -10329,7 +10329,7 @@
                                     <ref role="3cqZAo" node="3489cc5$mxT" resolve="fm" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$srA" role="2OqNvi">
-                                    <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char):int" resolve="charWidth" />
+                                    <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char)" resolve="charWidth" />
                                     <node concept="1Xhbcc" id="3489cc5$mya" role="37wK5m">
                                       <property role="1XhdNS" value="e" />
                                     </node>
@@ -10380,7 +10380,7 @@
                                       <ref role="3cqZAo" node="3489cc5$mxT" resolve="fm" />
                                     </node>
                                     <node concept="liA8E" id="3489cc5$srE" role="2OqNvi">
-                                      <ref role="37wK5l" to="z60i:~FontMetrics.getHeight():int" resolve="getHeight" />
+                                      <ref role="37wK5l" to="z60i:~FontMetrics.getHeight()" resolve="getHeight" />
                                     </node>
                                   </node>
                                 </node>
@@ -10389,7 +10389,7 @@
                                     <ref role="3cqZAo" node="3489cc5$mxT" resolve="fm" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$srI" role="2OqNvi">
-                                    <ref role="37wK5l" to="z60i:~FontMetrics.getLeading():int" resolve="getLeading" />
+                                    <ref role="37wK5l" to="z60i:~FontMetrics.getLeading()" resolve="getLeading" />
                                   </node>
                                 </node>
                               </node>
@@ -10577,7 +10577,7 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$srK" role="37vLTx">
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                       <node concept="37vLTw" id="3489cc5$mzD" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$myZ" resolve="tabsize" />
                       </node>
@@ -10686,7 +10686,7 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$srU" role="37vLTx">
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                       <node concept="37vLTw" id="3489cc5$m$i" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$mz3" resolve="contentwidth" />
                       </node>
@@ -10708,7 +10708,7 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$ss0" role="37vLTx">
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                       <node concept="37vLTw" id="3489cc5$m$o" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$mz7" resolve="contentheight" />
                       </node>
@@ -10947,7 +10947,7 @@
                           </node>
                           <node concept="2YIFZM" id="3489cc5$sse" role="37vLTx">
                             <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                            <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                            <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                             <node concept="2OqwBi" id="3489cc5$ssh" role="37wK5m">
                               <node concept="37vLTw" id="3489cc5$ssg" role="2Oq$k0">
                                 <ref role="3cqZAo" node="3489cc5$mBp" resolve="d" />
@@ -10979,7 +10979,7 @@
                           </node>
                           <node concept="2YIFZM" id="3489cc5$sss" role="37vLTx">
                             <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                            <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                            <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                             <node concept="2OqwBi" id="3489cc5$ssv" role="37wK5m">
                               <node concept="37vLTw" id="3489cc5$ssu" role="2Oq$k0">
                                 <ref role="3cqZAo" node="3489cc5$mBp" resolve="d" />
@@ -11677,7 +11677,7 @@
                       </node>
                       <node concept="2YIFZM" id="3489cc5$ste" role="3K4GZi">
                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                        <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                        <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                         <node concept="2OqwBi" id="3489cc5$sth" role="37wK5m">
                           <node concept="37vLTw" id="3489cc5$stg" role="2Oq$k0">
                             <ref role="3cqZAo" node="3489cc5$mD4" resolve="size" />
@@ -11714,7 +11714,7 @@
                       </node>
                       <node concept="2YIFZM" id="3489cc5$sts" role="3K4E3e">
                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                        <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                        <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                         <node concept="2OqwBi" id="3489cc5$stv" role="37wK5m">
                           <node concept="37vLTw" id="3489cc5$stu" role="2Oq$k0">
                             <ref role="3cqZAo" node="3489cc5$mD4" resolve="size" />
@@ -12025,7 +12025,7 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$su8" role="37vLTx">
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                       <node concept="2OqwBi" id="3489cc5$sub" role="37wK5m">
                         <node concept="37vLTw" id="3489cc5$sua" role="2Oq$k0">
                           <ref role="3cqZAo" node="3489cc5$mF2" resolve="size" />
@@ -12088,7 +12088,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3489cc5$mFW" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Component.getPreferredSize():java.awt.Dimension" resolve="getPreferredSize" />
+                  <ref role="37wK5l" to="z60i:~Component.getPreferredSize()" resolve="getPreferredSize" />
                 </node>
               </node>
             </node>
@@ -12598,7 +12598,7 @@
                   </node>
                   <node concept="2YIFZM" id="3489cc5$suv" role="3K4E3e">
                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                    <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                    <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                     <node concept="1rXfSq" id="3489cc5$mJc" role="37wK5m">
                       <ref role="37wK5l" node="3489cc5$rwA" resolve="getInteger" />
                       <node concept="37vLTw" id="3489cc5$mJd" role="37wK5m">
@@ -12841,7 +12841,7 @@
                 <node concept="3clFbF" id="3489cc5$mKO" role="3cqZAp">
                   <node concept="2YIFZM" id="3489cc5$sux" role="3clFbG">
                     <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                    <ref role="37wK5l" to="wyt6:~System.arraycopy(java.lang.Object,int,java.lang.Object,int,int):void" resolve="arraycopy" />
+                    <ref role="37wK5l" to="wyt6:~System.arraycopy(java.lang.Object,int,java.lang.Object,int,int)" resolve="arraycopy" />
                     <node concept="AH0OO" id="3489cc5$mKQ" role="37wK5m">
                       <node concept="37vLTw" id="3489cc5$mKR" role="AHHXb">
                         <ref role="3cqZAo" node="3489cc5$mHm" resolve="grid" />
@@ -12914,7 +12914,7 @@
                 <node concept="3clFbF" id="3489cc5$mLi" role="3cqZAp">
                   <node concept="2YIFZM" id="3489cc5$suz" role="3clFbG">
                     <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                    <ref role="37wK5l" to="wyt6:~System.arraycopy(java.lang.Object,int,java.lang.Object,int,int):void" resolve="arraycopy" />
+                    <ref role="37wK5l" to="wyt6:~System.arraycopy(java.lang.Object,int,java.lang.Object,int,int)" resolve="arraycopy" />
                     <node concept="AH0OO" id="3489cc5$mLk" role="37wK5m">
                       <node concept="37vLTw" id="3489cc5$mLl" role="AHHXb">
                         <ref role="3cqZAo" node="3489cc5$mHm" resolve="grid" />
@@ -13209,7 +13209,7 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$suD" role="37vLTx">
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                       <node concept="AH0OO" id="3489cc5$mMt" role="37wK5m">
                         <node concept="AH0OO" id="3489cc5$mMu" role="AHHXb">
                           <node concept="37vLTw" id="3489cc5$mMv" role="AHHXb">
@@ -13256,7 +13256,7 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$suJ" role="37vLTx">
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                       <node concept="AH0OO" id="3489cc5$mMF" role="37wK5m">
                         <node concept="AH0OO" id="3489cc5$mMG" role="AHHXb">
                           <node concept="37vLTw" id="3489cc5$mMH" role="AHHXb">
@@ -13427,7 +13427,7 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$suP" role="37vLTx">
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                       <node concept="AH0OO" id="3489cc5$mNL" role="37wK5m">
                         <node concept="AH0OO" id="3489cc5$mNM" role="AHHXb">
                           <node concept="37vLTw" id="3489cc5$mNN" role="AHHXb">
@@ -13474,7 +13474,7 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$suV" role="37vLTx">
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                       <node concept="AH0OO" id="3489cc5$mNZ" role="37wK5m">
                         <node concept="AH0OO" id="3489cc5$mO0" role="AHHXb">
                           <node concept="37vLTw" id="3489cc5$mO1" role="AHHXb">
@@ -14725,9 +14725,9 @@
               <ref role="3uigEE" to="z60i:~FontMetrics" resolve="FontMetrics" />
             </node>
             <node concept="1rXfSq" id="3489cc5$mWI" role="33vP2m">
-              <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font):java.awt.FontMetrics" resolve="getFontMetrics" />
+              <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
               <node concept="1rXfSq" id="3489cc5$mWJ" role="37wK5m">
-                <ref role="37wK5l" to="z60i:~Component.getFont():java.awt.Font" resolve="getFont" />
+                <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
               </node>
             </node>
           </node>
@@ -14759,7 +14759,7 @@
                             <ref role="3cqZAo" node="3489cc5$mWF" resolve="fm" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sv1" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char):int" resolve="charWidth" />
+                            <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char)" resolve="charWidth" />
                             <node concept="1Xhbcc" id="3489cc5$mWU" role="37wK5m">
                               <property role="1XhdNS" value="e" />
                             </node>
@@ -14783,7 +14783,7 @@
                       <ref role="3cqZAo" node="3489cc5$mWF" resolve="fm" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sv5" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~FontMetrics.getAscent():int" resolve="getAscent" />
+                      <ref role="37wK5l" to="z60i:~FontMetrics.getAscent()" resolve="getAscent" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="3489cc5$sv8" role="3uHU7w">
@@ -14791,7 +14791,7 @@
                       <ref role="3cqZAo" node="3489cc5$mWF" resolve="fm" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sv9" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~FontMetrics.getDescent():int" resolve="getDescent" />
+                      <ref role="37wK5l" to="z60i:~FontMetrics.getDescent()" resolve="getDescent" />
                     </node>
                   </node>
                 </node>
@@ -14904,9 +14904,9 @@
                   <ref role="3uigEE" to="z60i:~FontMetrics" resolve="FontMetrics" />
                 </node>
                 <node concept="1rXfSq" id="3489cc5$mXE" role="33vP2m">
-                  <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font):java.awt.FontMetrics" resolve="getFontMetrics" />
+                  <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
                   <node concept="1rXfSq" id="3489cc5$mXF" role="37wK5m">
-                    <ref role="37wK5l" to="z60i:~Component.getFont():java.awt.Font" resolve="getFont" />
+                    <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
                   </node>
                 </node>
               </node>
@@ -14921,7 +14921,7 @@
                     <ref role="3cqZAo" node="3489cc5$mXB" resolve="fm" />
                   </node>
                   <node concept="liA8E" id="3489cc5$svd" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                    <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                     <node concept="37vLTw" id="3489cc5$mXK" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$mXi" resolve="text" />
                     </node>
@@ -14940,7 +14940,7 @@
                       <ref role="3cqZAo" node="3489cc5$mXB" resolve="fm" />
                     </node>
                     <node concept="liA8E" id="3489cc5$svh" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~FontMetrics.getAscent():int" resolve="getAscent" />
+                      <ref role="37wK5l" to="z60i:~FontMetrics.getAscent()" resolve="getAscent" />
                     </node>
                   </node>
                   <node concept="2OqwBi" id="3489cc5$svk" role="3uHU7w">
@@ -14948,7 +14948,7 @@
                       <ref role="3cqZAo" node="3489cc5$mXB" resolve="fm" />
                     </node>
                     <node concept="liA8E" id="3489cc5$svl" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~FontMetrics.getDescent():int" resolve="getDescent" />
+                      <ref role="37wK5l" to="z60i:~FontMetrics.getDescent()" resolve="getDescent" />
                     </node>
                   </node>
                 </node>
@@ -15013,7 +15013,7 @@
                     <ref role="3cqZAo" node="3489cc5$mXR" resolve="icon" />
                   </node>
                   <node concept="liA8E" id="3489cc5$svp" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver):int" resolve="getWidth" />
+                    <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver)" resolve="getWidth" />
                     <node concept="Xjq3P" id="3489cc5$mYg" role="37wK5m" />
                   </node>
                 </node>
@@ -15029,7 +15029,7 @@
                     <ref role="3cqZAo" node="3489cc5$mXR" resolve="icon" />
                   </node>
                   <node concept="liA8E" id="3489cc5$svt" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Image.getHeight(java.awt.image.ImageObserver):int" resolve="getHeight" />
+                    <ref role="37wK5l" to="z60i:~Image.getHeight(java.awt.image.ImageObserver)" resolve="getHeight" />
                     <node concept="Xjq3P" id="3489cc5$mYl" role="37wK5m" />
                   </node>
                 </node>
@@ -15057,7 +15057,7 @@
               <node concept="3cpWs3" id="3489cc5$mYt" role="37wK5m">
                 <node concept="2YIFZM" id="3489cc5$svx" role="3uHU7B">
                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                  <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                  <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                   <node concept="37vLTw" id="3489cc5$mYv" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$mXt" resolve="th" />
                   </node>
@@ -15174,7 +15174,7 @@
             </node>
             <node concept="3cpWs6" id="3489cc5$mZ6" role="3cqZAp">
               <node concept="3nyPlj" id="3489cc5$mZ7" role="3cqZAk">
-                <ref role="37wK5l" to="z60i:~Component.imageUpdate(java.awt.Image,int,int,int,int,int):boolean" resolve="imageUpdate" />
+                <ref role="37wK5l" to="z60i:~Component.imageUpdate(java.awt.Image,int,int,int,int,int)" resolve="imageUpdate" />
                 <node concept="37vLTw" id="3489cc5$mZ8" role="37wK5m">
                   <ref role="3cqZAo" node="3489cc5$mYK" resolve="img" />
                 </node>
@@ -15252,7 +15252,7 @@
                 <ref role="3cqZAo" node="3489cc5$mZk" resolve="g" />
               </node>
               <node concept="liA8E" id="3489cc5$svB" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~Graphics.getClipBounds():java.awt.Rectangle" resolve="getClipBounds" />
+                <ref role="37wK5l" to="z60i:~Graphics.getClipBounds()" resolve="getClipBounds" />
               </node>
             </node>
           </node>
@@ -15304,7 +15304,7 @@
               <ref role="3cqZAo" node="3489cc5$lwe" resolve="content" />
             </node>
             <node concept="1rXfSq" id="3489cc5$mZz" role="37wK5m">
-              <ref role="37wK5l" to="z60i:~Component.isEnabled():boolean" resolve="isEnabled" />
+              <ref role="37wK5l" to="z60i:~Component.isEnabled()" resolve="isEnabled" />
             </node>
           </node>
         </node>
@@ -15453,7 +15453,7 @@
                 </node>
                 <node concept="2YIFZM" id="3489cc5$sw1" role="37vLTx">
                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                  <ref role="37wK5l" to="wyt6:~Math.abs(int):int" resolve="abs" />
+                  <ref role="37wK5l" to="wyt6:~Math.abs(int)" resolve="abs" />
                   <node concept="2OqwBi" id="3489cc5$sw4" role="37wK5m">
                     <node concept="37vLTw" id="3489cc5$sw3" role="2Oq$k0">
                       <ref role="3cqZAo" node="3489cc5$n00" resolve="bounds" />
@@ -15724,7 +15724,7 @@
               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
             </node>
             <node concept="liA8E" id="3489cc5$swD" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics.translate(int,int):void" resolve="translate" />
+              <ref role="37wK5l" to="z60i:~Graphics.translate(int,int)" resolve="translate" />
               <node concept="2OqwBi" id="3489cc5$swG" role="37wK5m">
                 <node concept="37vLTw" id="3489cc5$swF" role="2Oq$k0">
                   <ref role="3cqZAo" node="3489cc5$n00" resolve="bounds" />
@@ -16006,7 +16006,7 @@
                                                       <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$sx2" role="2OqNvi">
-                                                      <ref role="37wK5l" to="z60i:~Graphics.clipRect(int,int,int,int):void" resolve="clipRect" />
+                                                      <ref role="37wK5l" to="z60i:~Graphics.clipRect(int,int,int,int)" resolve="clipRect" />
                                                       <node concept="3cmrfG" id="3489cc5$nTR" role="37wK5m">
                                                         <property role="3cmrfH" value="0" />
                                                       </node>
@@ -16051,7 +16051,7 @@
                                                       </node>
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$nU3" role="2OqNvi">
-                                                      <ref role="37wK5l" to="z60i:~Component.paint(java.awt.Graphics):void" resolve="paint" />
+                                                      <ref role="37wK5l" to="z60i:~Component.paint(java.awt.Graphics)" resolve="paint" />
                                                       <node concept="37vLTw" id="3489cc5$nU4" role="37wK5m">
                                                         <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                       </node>
@@ -16064,7 +16064,7 @@
                                                       <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$sxe" role="2OqNvi">
-                                                      <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int):void" resolve="setClip" />
+                                                      <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int)" resolve="setClip" />
                                                       <node concept="37vLTw" id="3489cc5$nU7" role="37wK5m">
                                                         <ref role="3cqZAo" node="3489cc5$mZE" resolve="clipx" />
                                                       </node>
@@ -16479,7 +16479,7 @@
                                                                   <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                 </node>
                                                                 <node concept="liA8E" id="3489cc5$sxU" role="2OqNvi">
-                                                                  <ref role="37wK5l" to="z60i:~Graphics.translate(int,int):void" resolve="translate" />
+                                                                  <ref role="37wK5l" to="z60i:~Graphics.translate(int,int)" resolve="translate" />
                                                                   <node concept="3cpWs3" id="3489cc5$nRf" role="37wK5m">
                                                                     <node concept="2OqwBi" id="3489cc5$sxX" role="3uHU7B">
                                                                       <node concept="37vLTw" id="3489cc5$sxW" role="2Oq$k0">
@@ -16515,7 +16515,7 @@
                                                                   <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                 </node>
                                                                 <node concept="liA8E" id="3489cc5$sy6" role="2OqNvi">
-                                                                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                                                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                                                   <node concept="3K4zz7" id="3489cc5$nRq" role="37wK5m">
                                                                     <node concept="37vLTw" id="3489cc5$nRn" role="3K4Cdx">
                                                                       <ref role="3cqZAo" node="3489cc5$nQm" resolve="menuenabled" />
@@ -16545,7 +16545,7 @@
                                                                         <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                       </node>
                                                                       <node concept="liA8E" id="3489cc5$sya" role="2OqNvi">
-                                                                        <ref role="37wK5l" to="z60i:~Graphics.drawOval(int,int,int,int):void" resolve="drawOval" />
+                                                                        <ref role="37wK5l" to="z60i:~Graphics.drawOval(int,int,int,int)" resolve="drawOval" />
                                                                         <node concept="3cmrfG" id="3489cc5$nRJ" role="37wK5m">
                                                                           <property role="3cmrfH" value="1" />
                                                                         </node>
@@ -16585,7 +16585,7 @@
                                                                       <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                     </node>
                                                                     <node concept="liA8E" id="3489cc5$sye" role="2OqNvi">
-                                                                      <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int):void" resolve="drawRect" />
+                                                                      <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int)" resolve="drawRect" />
                                                                       <node concept="3cmrfG" id="3489cc5$nRz" role="37wK5m">
                                                                         <property role="3cmrfH" value="1" />
                                                                       </node>
@@ -16624,7 +16624,7 @@
                                                                       <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                     </node>
                                                                     <node concept="liA8E" id="3489cc5$syi" role="2OqNvi">
-                                                                      <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                                                      <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                                                       <node concept="3K4zz7" id="3489cc5$nS0" role="37wK5m">
                                                                         <node concept="37vLTw" id="3489cc5$nRX" role="3K4Cdx">
                                                                           <ref role="3cqZAo" node="3489cc5$nQm" resolve="menuenabled" />
@@ -16654,7 +16654,7 @@
                                                                             <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                           </node>
                                                                           <node concept="liA8E" id="3489cc5$sym" role="2OqNvi">
-                                                                            <ref role="37wK5l" to="z60i:~Graphics.fillOval(int,int,int,int):void" resolve="fillOval" />
+                                                                            <ref role="37wK5l" to="z60i:~Graphics.fillOval(int,int,int,int)" resolve="fillOval" />
                                                                             <node concept="3cmrfG" id="3489cc5$nSB" role="37wK5m">
                                                                               <property role="3cmrfH" value="5" />
                                                                             </node>
@@ -16691,7 +16691,7 @@
                                                                             <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                           </node>
                                                                           <node concept="liA8E" id="3489cc5$syq" role="2OqNvi">
-                                                                            <ref role="37wK5l" to="z60i:~Graphics.drawOval(int,int,int,int):void" resolve="drawOval" />
+                                                                            <ref role="37wK5l" to="z60i:~Graphics.drawOval(int,int,int,int)" resolve="drawOval" />
                                                                             <node concept="3cmrfG" id="3489cc5$nSL" role="37wK5m">
                                                                               <property role="3cmrfH" value="4" />
                                                                             </node>
@@ -16731,7 +16731,7 @@
                                                                           <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                         </node>
                                                                         <node concept="liA8E" id="3489cc5$syu" role="2OqNvi">
-                                                                          <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int):void" resolve="fillRect" />
+                                                                          <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
                                                                           <node concept="3cmrfG" id="3489cc5$nS9" role="37wK5m">
                                                                             <property role="3cmrfH" value="3" />
                                                                           </node>
@@ -16758,7 +16758,7 @@
                                                                           <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                         </node>
                                                                         <node concept="liA8E" id="3489cc5$syy" role="2OqNvi">
-                                                                          <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                                                                          <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                                                                           <node concept="3cmrfG" id="3489cc5$nSh" role="37wK5m">
                                                                             <property role="3cmrfH" value="3" />
                                                                           </node>
@@ -16790,7 +16790,7 @@
                                                                           <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                         </node>
                                                                         <node concept="liA8E" id="3489cc5$syA" role="2OqNvi">
-                                                                          <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                                                                          <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                                                                           <node concept="3cmrfG" id="3489cc5$nSr" role="37wK5m">
                                                                             <property role="3cmrfH" value="4" />
                                                                           </node>
@@ -16826,7 +16826,7 @@
                                                                   <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                 </node>
                                                                 <node concept="liA8E" id="3489cc5$syE" role="2OqNvi">
-                                                                  <ref role="37wK5l" to="z60i:~Graphics.translate(int,int):void" resolve="translate" />
+                                                                  <ref role="37wK5l" to="z60i:~Graphics.translate(int,int)" resolve="translate" />
                                                                   <node concept="3cpWsd" id="3489cc5$nSV" role="37wK5m">
                                                                     <node concept="1ZRNhn" id="3489cc5$nSW" role="3uHU7B">
                                                                       <node concept="2OqwBi" id="3489cc5$syH" role="2$L3a6">
@@ -17023,7 +17023,7 @@
                                                             <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                           </node>
                                                           <node concept="liA8E" id="3489cc5$szi" role="2OqNvi">
-                                                            <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                                            <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                                             <node concept="37vLTw" id="3489cc5$nQ4" role="37wK5m">
                                                               <ref role="3cqZAo" node="3489cc5$lv5" resolve="c_border" />
                                                             </node>
@@ -17036,7 +17036,7 @@
                                                             <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                           </node>
                                                           <node concept="liA8E" id="3489cc5$szm" role="2OqNvi">
-                                                            <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int):void" resolve="fillRect" />
+                                                            <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
                                                             <node concept="2OqwBi" id="3489cc5$szp" role="37wK5m">
                                                               <node concept="37vLTw" id="3489cc5$szo" role="2Oq$k0">
                                                                 <ref role="3cqZAo" node="3489cc5$nPv" resolve="r" />
@@ -17545,7 +17545,7 @@
                                                 <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$s$u" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                                <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                                 <node concept="3K4zz7" id="3489cc5$nMe" role="37wK5m">
                                                   <node concept="37vLTw" id="3489cc5$nMb" role="3K4Cdx">
                                                     <ref role="3cqZAo" node="3489cc5$mZO" resolve="enabled" />
@@ -17566,7 +17566,7 @@
                                                 <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$s$y" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int):void" resolve="fillRect" />
+                                                <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
                                                 <node concept="3cmrfG" id="3489cc5$nMh" role="37wK5m">
                                                   <property role="3cmrfH" value="0" />
                                                 </node>
@@ -17682,7 +17682,7 @@
                                               </node>
                                               <node concept="2YIFZM" id="3489cc5$s$O" role="3uHU7w">
                                                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                                <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                                 <node concept="3cmrfG" id="3489cc5$nBB" role="37wK5m">
                                                   <property role="3cmrfH" value="0" />
                                                 </node>
@@ -17709,7 +17709,7 @@
                                               </node>
                                               <node concept="2YIFZM" id="3489cc5$s$U" role="3uHU7w">
                                                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                                <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                                 <node concept="3cpWsd" id="3489cc5$nBJ" role="37wK5m">
                                                   <node concept="2OqwBi" id="3489cc5$s$X" role="3uHU7B">
                                                     <node concept="37vLTw" id="3489cc5$s$W" role="2Oq$k0">
@@ -17821,7 +17821,7 @@
                                                       <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$s_6" role="2OqNvi">
-                                                      <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int):void" resolve="setClip" />
+                                                      <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int)" resolve="setClip" />
                                                       <node concept="2OqwBi" id="3489cc5$s_9" role="37wK5m">
                                                         <node concept="37vLTw" id="3489cc5$s_8" role="2Oq$k0">
                                                           <ref role="3cqZAo" node="3489cc5$nBe" resolve="viewport" />
@@ -17948,7 +17948,7 @@
                                                         </node>
                                                         <node concept="2YIFZM" id="3489cc5$s_o" role="37vLTx">
                                                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                                           <node concept="37vLTw" id="3489cc5$nD8" role="37wK5m">
                                                             <ref role="3cqZAo" node="3489cc5$nCT" resolve="width" />
                                                           </node>
@@ -18202,7 +18202,7 @@
                                                       <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$s_K" role="2OqNvi">
-                                                      <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int):void" resolve="setClip" />
+                                                      <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int)" resolve="setClip" />
                                                       <node concept="37vLTw" id="3489cc5$nEu" role="37wK5m">
                                                         <ref role="3cqZAo" node="3489cc5$mZE" resolve="clipx" />
                                                       </node>
@@ -18385,7 +18385,7 @@
                                                   </node>
                                                   <node concept="2YIFZM" id="3489cc5$sAa" role="3uHU7w">
                                                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                    <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                                    <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                                     <node concept="3cmrfG" id="3489cc5$nFl" role="37wK5m">
                                                       <property role="3cmrfH" value="0" />
                                                     </node>
@@ -18412,7 +18412,7 @@
                                                   </node>
                                                   <node concept="2YIFZM" id="3489cc5$sAg" role="3uHU7w">
                                                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                    <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                                    <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                                     <node concept="3cpWsd" id="3489cc5$nFt" role="37wK5m">
                                                       <node concept="2OqwBi" id="3489cc5$sAj" role="3uHU7B">
                                                         <node concept="37vLTw" id="3489cc5$sAi" role="2Oq$k0">
@@ -18762,7 +18762,7 @@
                                                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                             </node>
                                                             <node concept="liA8E" id="3489cc5$sAK" role="2OqNvi">
-                                                              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                                              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                                               <node concept="37vLTw" id="3489cc5$nHo" role="37wK5m">
                                                                 <ref role="3cqZAo" node="3489cc5$lvl" resolve="c_focus" />
                                                               </node>
@@ -18775,7 +18775,7 @@
                                                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                             </node>
                                                             <node concept="liA8E" id="3489cc5$sAO" role="2OqNvi">
-                                                              <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int):void" resolve="drawRect" />
+                                                              <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int)" resolve="drawRect" />
                                                               <node concept="3cmrfG" id="3489cc5$nHr" role="37wK5m">
                                                                 <property role="3cmrfH" value="0" />
                                                               </node>
@@ -19110,7 +19110,7 @@
                                                                     <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                   </node>
                                                                   <node concept="liA8E" id="3489cc5$sB$" role="2OqNvi">
-                                                                    <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                                                    <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                                                     <node concept="3K4zz7" id="3489cc5$nKI" role="37wK5m">
                                                                       <node concept="37vLTw" id="3489cc5$nKF" role="3K4Cdx">
                                                                         <ref role="3cqZAo" node="3489cc5$nJg" resolve="itemenabled" />
@@ -19131,7 +19131,7 @@
                                                                     <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                   </node>
                                                                   <node concept="liA8E" id="3489cc5$sBC" role="2OqNvi">
-                                                                    <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                                                                    <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                                                                     <node concept="3cpWsd" id="3489cc5$nKL" role="37wK5m">
                                                                       <node concept="37vLTw" id="3489cc5$nKM" role="3uHU7B">
                                                                         <ref role="3cqZAo" node="3489cc5$nJZ" resolve="x" />
@@ -19170,7 +19170,7 @@
                                                                         <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                                       </node>
                                                                       <node concept="liA8E" id="3489cc5$sBG" role="2OqNvi">
-                                                                        <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                                                                        <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                                                                         <node concept="37vLTw" id="3489cc5$nL0" role="37wK5m">
                                                                           <ref role="3cqZAo" node="3489cc5$nJZ" resolve="x" />
                                                                         </node>
@@ -19782,7 +19782,7 @@
                                             <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$sC8" role="2OqNvi">
-                                            <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                            <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                             <node concept="3K4zz7" id="3489cc5$n_b" role="37wK5m">
                                               <node concept="37vLTw" id="3489cc5$n_4" role="3K4Cdx">
                                                 <ref role="3cqZAo" node="3489cc5$mZO" resolve="enabled" />
@@ -19842,7 +19842,7 @@
                                           <node concept="10Oyi0" id="3489cc5$n_l" role="1tU5fm" />
                                           <node concept="2YIFZM" id="3489cc5$sCi" role="33vP2m">
                                             <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                            <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                            <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                             <node concept="3cmrfG" id="3489cc5$n_n" role="37wK5m">
                                               <property role="3cmrfH" value="0" />
                                             </node>
@@ -19869,7 +19869,7 @@
                                           <node concept="10Oyi0" id="3489cc5$n_v" role="1tU5fm" />
                                           <node concept="2YIFZM" id="3489cc5$sCk" role="33vP2m">
                                             <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                            <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                            <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                             <node concept="3cpWs3" id="3489cc5$n_x" role="37wK5m">
                                               <node concept="FJ1c_" id="3489cc5$n_y" role="3uHU7B">
                                                 <node concept="37vLTw" id="3489cc5$n_z" role="3uHU7B">
@@ -19942,7 +19942,7 @@
                                                       <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$sCo" role="2OqNvi">
-                                                      <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                                                      <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                                                       <node concept="37vLTw" id="3489cc5$nA9" role="37wK5m">
                                                         <ref role="3cqZAo" node="3489cc5$n_j" resolve="xy1" />
                                                       </node>
@@ -19967,7 +19967,7 @@
                                                     <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                   </node>
                                                   <node concept="liA8E" id="3489cc5$sCs" role="2OqNvi">
-                                                    <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                                                    <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                                                     <node concept="37vLTw" id="3489cc5$nA1" role="37wK5m">
                                                       <ref role="3cqZAo" node="3489cc5$n_E" resolve="i" />
                                                     </node>
@@ -20450,7 +20450,7 @@
                                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$sCS" role="2OqNvi">
-                                              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                               <node concept="37vLTw" id="3489cc5$nz4" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$lvl" resolve="c_focus" />
                                               </node>
@@ -20463,7 +20463,7 @@
                                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$sCW" role="2OqNvi">
-                                              <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int):void" resolve="drawRect" />
+                                              <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int)" resolve="drawRect" />
                                               <node concept="3K4zz7" id="3489cc5$nzd" role="37wK5m">
                                                 <node concept="37vLTw" id="3489cc5$nz7" role="3K4Cdx">
                                                   <ref role="3cqZAo" node="3489cc5$nxu" resolve="horizontal" />
@@ -21388,7 +21388,7 @@
                                         <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                       </node>
                                       <node concept="liA8E" id="3489cc5$sEw" role="2OqNvi">
-                                        <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                        <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                         <node concept="37vLTw" id="3489cc5$ntY" role="37wK5m">
                                           <ref role="3cqZAo" node="3489cc5$luX" resolve="c_text" />
                                         </node>
@@ -21401,7 +21401,7 @@
                                         <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                       </node>
                                       <node concept="liA8E" id="3489cc5$sE$" role="2OqNvi">
-                                        <ref role="37wK5l" to="z60i:~Graphics.drawString(java.lang.String,int,int):void" resolve="drawString" />
+                                        <ref role="37wK5l" to="z60i:~Graphics.drawString(java.lang.String,int,int)" resolve="drawString" />
                                         <node concept="37vLTw" id="3489cc5$nu1" role="37wK5m">
                                           <ref role="3cqZAo" node="3489cc5$ntP" resolve="text" />
                                         </node>
@@ -21434,11 +21434,11 @@
                                                   <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                                 </node>
                                                 <node concept="liA8E" id="3489cc5$sEK" role="2OqNvi">
-                                                  <ref role="37wK5l" to="z60i:~Graphics.getFontMetrics():java.awt.FontMetrics" resolve="getFontMetrics" />
+                                                  <ref role="37wK5l" to="z60i:~Graphics.getFontMetrics()" resolve="getFontMetrics" />
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="3489cc5$nua" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~FontMetrics.getAscent():int" resolve="getAscent" />
+                                                <ref role="37wK5l" to="z60i:~FontMetrics.getAscent()" resolve="getAscent" />
                                               </node>
                                             </node>
                                           </node>
@@ -22246,7 +22246,7 @@
                                         <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                       </node>
                                       <node concept="liA8E" id="3489cc5$sF$" role="2OqNvi">
-                                        <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                        <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                         <node concept="37vLTw" id="3489cc5$nnV" role="37wK5m">
                                           <ref role="3cqZAo" node="3489cc5$lvl" resolve="c_focus" />
                                         </node>
@@ -22259,7 +22259,7 @@
                                         <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                       </node>
                                       <node concept="liA8E" id="3489cc5$sFC" role="2OqNvi">
-                                        <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int):void" resolve="drawRect" />
+                                        <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int)" resolve="drawRect" />
                                         <node concept="3cpWs3" id="3489cc5$nnY" role="37wK5m">
                                           <node concept="2OqwBi" id="3489cc5$sFF" role="3uHU7B">
                                             <node concept="37vLTw" id="3489cc5$sFE" role="2Oq$k0">
@@ -23166,7 +23166,7 @@
                                 <node concept="10Oyi0" id="3489cc5$nf6" role="1tU5fm" />
                                 <node concept="2YIFZM" id="3489cc5$sHM" role="33vP2m">
                                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                  <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                  <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                   <node concept="37vLTw" id="3489cc5$nf8" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$neK" resolve="start" />
                                   </node>
@@ -23183,7 +23183,7 @@
                                 <node concept="10Oyi0" id="3489cc5$nfc" role="1tU5fm" />
                                 <node concept="2YIFZM" id="3489cc5$sHO" role="33vP2m">
                                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                  <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                  <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                   <node concept="37vLTw" id="3489cc5$nfe" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$neK" resolve="start" />
                                   </node>
@@ -23224,7 +23224,7 @@
                                     <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$sHS" role="2OqNvi">
-                                    <ref role="37wK5l" to="z60i:~Graphics.getFontMetrics():java.awt.FontMetrics" resolve="getFontMetrics" />
+                                    <ref role="37wK5l" to="z60i:~Graphics.getFontMetrics()" resolve="getFontMetrics" />
                                   </node>
                                 </node>
                               </node>
@@ -23244,7 +23244,7 @@
                                     <ref role="3cqZAo" node="3489cc5$nfn" resolve="fm" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$sHW" role="2OqNvi">
-                                    <ref role="37wK5l" to="z60i:~FontMetrics.getAscent():int" resolve="getAscent" />
+                                    <ref role="37wK5l" to="z60i:~FontMetrics.getAscent()" resolve="getAscent" />
                                   </node>
                                 </node>
                               </node>
@@ -23259,7 +23259,7 @@
                                     <ref role="3cqZAo" node="3489cc5$nfn" resolve="fm" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$sI0" role="2OqNvi">
-                                    <ref role="37wK5l" to="z60i:~FontMetrics.getHeight():int" resolve="getHeight" />
+                                    <ref role="37wK5l" to="z60i:~FontMetrics.getHeight()" resolve="getHeight" />
                                   </node>
                                 </node>
                               </node>
@@ -23325,7 +23325,7 @@
                                   </node>
                                   <node concept="2YIFZM" id="3489cc5$sIa" role="3uHU7w">
                                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                    <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                    <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                     <node concept="3cmrfG" id="3489cc5$nfP" role="37wK5m">
                                       <property role="3cmrfH" value="0" />
                                     </node>
@@ -23352,7 +23352,7 @@
                                   </node>
                                   <node concept="2YIFZM" id="3489cc5$sIg" role="3uHU7w">
                                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                    <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                    <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                     <node concept="3cpWsd" id="3489cc5$nfX" role="37wK5m">
                                       <node concept="2OqwBi" id="3489cc5$sIj" role="3uHU7B">
                                         <node concept="37vLTw" id="3489cc5$sIi" role="2Oq$k0">
@@ -23403,7 +23403,7 @@
                                     <ref role="3cqZAo" node="3489cc5$neD" resolve="text" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$sIo" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                    <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                                   </node>
                                 </node>
                               </node>
@@ -23503,7 +23503,7 @@
                                                       <ref role="3cqZAo" node="3489cc5$neD" resolve="text" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$sIs" role="2OqNvi">
-                                                      <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                                      <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                                       <node concept="37vLTw" id="3489cc5$nin" role="37wK5m">
                                                         <ref role="3cqZAo" node="3489cc5Iiai" resolve="k" />
                                                       </node>
@@ -23566,7 +23566,7 @@
                                                             <ref role="3cqZAo" node="3489cc5$neD" resolve="text" />
                                                           </node>
                                                           <node concept="liA8E" id="3489cc5$sIw" role="2OqNvi">
-                                                            <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                                            <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                                             <node concept="37vLTw" id="3489cc5$ngZ" role="37wK5m">
                                                               <ref role="3cqZAo" node="3489cc5Iiai" resolve="k" />
                                                             </node>
@@ -23610,13 +23610,13 @@
                                                 <ref role="3cqZAo" node="3489cc5$nfn" resolve="fm" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$sI$" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                                                <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                                                 <node concept="2OqwBi" id="3489cc5$sIB" role="37wK5m">
                                                   <node concept="37vLTw" id="3489cc5$sIA" role="2Oq$k0">
                                                     <ref role="3cqZAo" node="3489cc5$neD" resolve="text" />
                                                   </node>
                                                   <node concept="liA8E" id="3489cc5$sIC" role="2OqNvi">
-                                                    <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                                    <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                                     <node concept="37vLTw" id="3489cc5$nhf" role="37wK5m">
                                                       <ref role="3cqZAo" node="3489cc5$ngg" resolve="i" />
                                                     </node>
@@ -23821,7 +23821,7 @@
                                               <ref role="3cqZAo" node="3489cc5$neD" resolve="text" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$sIK" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                              <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                               <node concept="37vLTw" id="3489cc5$niP" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$ngg" resolve="i" />
                                               </node>
@@ -23835,7 +23835,7 @@
                                               <ref role="3cqZAo" node="3489cc5$neD" resolve="text" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$sIO" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~String.substring(int):java.lang.String" resolve="substring" />
+                                              <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
                                               <node concept="37vLTw" id="3489cc5$niS" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$ngg" resolve="i" />
                                               </node>
@@ -23975,13 +23975,13 @@
                                                       <ref role="3cqZAo" node="3489cc5$nfn" resolve="fm" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$sIW" role="2OqNvi">
-                                                      <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                                                      <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                                                       <node concept="2OqwBi" id="3489cc5$sIZ" role="37wK5m">
                                                         <node concept="37vLTw" id="3489cc5$sIY" role="2Oq$k0">
                                                           <ref role="3cqZAo" node="3489cc5$neD" resolve="text" />
                                                         </node>
                                                         <node concept="liA8E" id="3489cc5$sJ0" role="2OqNvi">
-                                                          <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                                          <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                                           <node concept="37vLTw" id="3489cc5$njI" role="37wK5m">
                                                             <ref role="3cqZAo" node="3489cc5$ngg" resolve="i" />
                                                           </node>
@@ -24059,13 +24059,13 @@
                                                   <ref role="3cqZAo" node="3489cc5$nfn" resolve="fm" />
                                                 </node>
                                                 <node concept="liA8E" id="3489cc5$sJ8" role="2OqNvi">
-                                                  <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                                                  <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                                                   <node concept="2OqwBi" id="3489cc5$sJb" role="37wK5m">
                                                     <node concept="37vLTw" id="3489cc5$sJa" role="2Oq$k0">
                                                       <ref role="3cqZAo" node="3489cc5$neD" resolve="text" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$sJc" role="2OqNvi">
-                                                      <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                                      <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                                       <node concept="37vLTw" id="3489cc5$nk7" role="37wK5m">
                                                         <ref role="3cqZAo" node="3489cc5$ngg" resolve="i" />
                                                       </node>
@@ -24095,7 +24095,7 @@
                                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$sJg" role="2OqNvi">
-                                              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                               <node concept="37vLTw" id="3489cc5$nkc" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$lvp" resolve="c_select" />
                                               </node>
@@ -24108,7 +24108,7 @@
                                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$sJk" role="2OqNvi">
-                                              <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int):void" resolve="fillRect" />
+                                              <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
                                               <node concept="3cpWs3" id="3489cc5$nkf" role="37wK5m">
                                                 <node concept="3cmrfG" id="3489cc5$nkg" role="3uHU7B">
                                                   <property role="3cmrfH" value="1" />
@@ -24142,7 +24142,7 @@
                                           <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$sJo" role="2OqNvi">
-                                          <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                          <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                           <node concept="3K4zz7" id="3489cc5$nks" role="37wK5m">
                                             <node concept="37vLTw" id="3489cc5$nkp" role="3K4Cdx">
                                               <ref role="3cqZAo" node="3489cc5$mZO" resolve="enabled" />
@@ -24163,7 +24163,7 @@
                                           <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$sJs" role="2OqNvi">
-                                          <ref role="37wK5l" to="z60i:~Graphics.drawString(java.lang.String,int,int):void" resolve="drawString" />
+                                          <ref role="37wK5l" to="z60i:~Graphics.drawString(java.lang.String,int,int)" resolve="drawString" />
                                           <node concept="37vLTw" id="3489cc5$nkv" role="37wK5m">
                                             <ref role="3cqZAo" node="3489cc5$niG" resolve="line" />
                                           </node>
@@ -24246,13 +24246,13 @@
                                                 <ref role="3cqZAo" node="3489cc5$nfn" resolve="fm" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$sJw" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                                                <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                                                 <node concept="2OqwBi" id="3489cc5$sJz" role="37wK5m">
                                                   <node concept="37vLTw" id="3489cc5$sJy" role="2Oq$k0">
                                                     <ref role="3cqZAo" node="3489cc5$neD" resolve="text" />
                                                   </node>
                                                   <node concept="liA8E" id="3489cc5$sJ$" role="2OqNvi">
-                                                    <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                                    <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                                     <node concept="37vLTw" id="3489cc5$nkY" role="37wK5m">
                                                       <ref role="3cqZAo" node="3489cc5$ngg" resolve="i" />
                                                     </node>
@@ -24281,7 +24281,7 @@
                                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$sJC" role="2OqNvi">
-                                              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                               <node concept="37vLTw" id="3489cc5$nl2" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$lvl" resolve="c_focus" />
                                               </node>
@@ -24294,7 +24294,7 @@
                                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$sJG" role="2OqNvi">
-                                              <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int):void" resolve="fillRect" />
+                                              <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
                                               <node concept="37vLTw" id="3489cc5$nl5" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$nkT" resolve="caret" />
                                               </node>
@@ -24481,7 +24481,7 @@
                           <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                         </node>
                         <node concept="liA8E" id="3489cc5$sJS" role="2OqNvi">
-                          <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                          <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                           <node concept="37vLTw" id="3489cc5$naC" role="37wK5m">
                             <ref role="3cqZAo" node="3489cc5$lv5" resolve="c_border" />
                           </node>
@@ -24494,7 +24494,7 @@
                           <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                         </node>
                         <node concept="liA8E" id="3489cc5$sJW" role="2OqNvi">
-                          <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int):void" resolve="drawRect" />
+                          <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int)" resolve="drawRect" />
                           <node concept="2OqwBi" id="3489cc5$sJZ" role="37wK5m">
                             <node concept="37vLTw" id="3489cc5$sJY" role="2Oq$k0">
                               <ref role="3cqZAo" node="3489cc5$naw" resolve="viewport" />
@@ -24637,7 +24637,7 @@
                               </node>
                               <node concept="2YIFZM" id="3489cc5$sKm" role="3uHU7w">
                                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                 <node concept="3cmrfG" id="3489cc5$nbm" role="37wK5m">
                                   <property role="3cmrfH" value="0" />
                                 </node>
@@ -24664,7 +24664,7 @@
                               </node>
                               <node concept="2YIFZM" id="3489cc5$sKs" role="3uHU7w">
                                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                 <node concept="3cpWsd" id="3489cc5$nbu" role="37wK5m">
                                   <node concept="2OqwBi" id="3489cc5$sKv" role="3uHU7B">
                                     <node concept="37vLTw" id="3489cc5$sKu" role="2Oq$k0">
@@ -25267,7 +25267,7 @@
                                   <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$sLC" role="2OqNvi">
-                                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                                   <node concept="37vLTw" id="3489cc5$na7" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$lvl" resolve="c_focus" />
                                   </node>
@@ -25280,7 +25280,7 @@
                                   <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$sLG" role="2OqNvi">
-                                  <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int):void" resolve="drawRect" />
+                                  <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int)" resolve="drawRect" />
                                   <node concept="3cmrfG" id="3489cc5$naa" role="37wK5m">
                                     <property role="3cmrfH" value="2" />
                                   </node>
@@ -25364,7 +25364,7 @@
                                 <ref role="3cqZAo" node="3489cc5$n7R" resolve="icon" />
                               </node>
                               <node concept="liA8E" id="3489cc5$sLS" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver):int" resolve="getWidth" />
+                                <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver)" resolve="getWidth" />
                                 <node concept="Xjq3P" id="3489cc5$n86" role="37wK5m" />
                               </node>
                             </node>
@@ -25450,7 +25450,7 @@
                                 <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                               </node>
                               <node concept="liA8E" id="3489cc5$sM4" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~Graphics.drawImage(java.awt.Image,int,int,java.awt.image.ImageObserver):boolean" resolve="drawImage" />
+                                <ref role="37wK5l" to="z60i:~Graphics.drawImage(java.awt.Image,int,int,java.awt.image.ImageObserver)" resolve="drawImage" />
                                 <node concept="37vLTw" id="3489cc5$n8z" role="37wK5m">
                                   <ref role="3cqZAo" node="3489cc5$n7R" resolve="icon" />
                                 </node>
@@ -25473,7 +25473,7 @@
                                           <ref role="3cqZAo" node="3489cc5$n7R" resolve="icon" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$sMc" role="2OqNvi">
-                                          <ref role="37wK5l" to="z60i:~Image.getHeight(java.awt.image.ImageObserver):int" resolve="getHeight" />
+                                          <ref role="37wK5l" to="z60i:~Image.getHeight(java.awt.image.ImageObserver)" resolve="getHeight" />
                                           <node concept="Xjq3P" id="3489cc5$n8D" role="37wK5m" />
                                         </node>
                                       </node>
@@ -25718,7 +25718,7 @@
                             <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sMs" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                            <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                             <node concept="3K4zz7" id="3489cc5$n4J" role="37wK5m">
                               <node concept="1eOMI4" id="3489cc5$n4G" role="3K4Cdx">
                                 <node concept="3y3z36" id="3489cc5$n4D" role="1eOMHV">
@@ -25746,7 +25746,7 @@
                             <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sMw" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~Graphics.fillOval(int,int,int,int):void" resolve="fillOval" />
+                            <ref role="37wK5l" to="z60i:~Graphics.fillOval(int,int,int,int)" resolve="fillOval" />
                             <node concept="3cmrfG" id="3489cc5$n4M" role="37wK5m">
                               <property role="3cmrfH" value="1" />
                             </node>
@@ -25788,7 +25788,7 @@
                             <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sM$" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                            <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                             <node concept="37vLTw" id="3489cc5$n4Y" role="37wK5m">
                               <ref role="3cqZAo" node="3489cc5$n3C" resolve="border" />
                             </node>
@@ -25801,7 +25801,7 @@
                             <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sMC" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~Graphics.drawOval(int,int,int,int):void" resolve="drawOval" />
+                            <ref role="37wK5l" to="z60i:~Graphics.drawOval(int,int,int,int)" resolve="drawOval" />
                             <node concept="3cmrfG" id="3489cc5$n51" role="37wK5m">
                               <property role="3cmrfH" value="1" />
                             </node>
@@ -25906,7 +25906,7 @@
                           <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                         </node>
                         <node concept="liA8E" id="3489cc5$sMG" role="2OqNvi">
-                          <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                          <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                           <node concept="37vLTw" id="3489cc5$n5h" role="37wK5m">
                             <ref role="3cqZAo" node="3489cc5$lvl" resolve="c_focus" />
                           </node>
@@ -25928,7 +25928,7 @@
                                 <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                               </node>
                               <node concept="liA8E" id="3489cc5$sMK" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~Graphics.drawOval(int,int,int,int):void" resolve="drawOval" />
+                                <ref role="37wK5l" to="z60i:~Graphics.drawOval(int,int,int,int)" resolve="drawOval" />
                                 <node concept="3cmrfG" id="3489cc5$n5C" role="37wK5m">
                                   <property role="3cmrfH" value="3" />
                                 </node>
@@ -25973,7 +25973,7 @@
                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                             </node>
                             <node concept="liA8E" id="3489cc5$sMO" role="2OqNvi">
-                              <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int):void" resolve="drawRect" />
+                              <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int)" resolve="drawRect" />
                               <node concept="3cmrfG" id="3489cc5$n5q" role="37wK5m">
                                 <property role="3cmrfH" value="3" />
                               </node>
@@ -26056,7 +26056,7 @@
                           <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                         </node>
                         <node concept="liA8E" id="3489cc5$sMS" role="2OqNvi">
-                          <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                          <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                           <node concept="3K4zz7" id="3489cc5$n6b" role="37wK5m">
                             <node concept="37vLTw" id="3489cc5$n68" role="3K4Cdx">
                               <ref role="3cqZAo" node="3489cc5$mZO" resolve="enabled" />
@@ -26086,7 +26086,7 @@
                                 <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                               </node>
                               <node concept="liA8E" id="3489cc5$sMW" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~Graphics.fillOval(int,int,int,int):void" resolve="fillOval" />
+                                <ref role="37wK5l" to="z60i:~Graphics.fillOval(int,int,int,int)" resolve="fillOval" />
                                 <node concept="3cmrfG" id="3489cc5$n6W" role="37wK5m">
                                   <property role="3cmrfH" value="5" />
                                 </node>
@@ -26128,7 +26128,7 @@
                                 <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                               </node>
                               <node concept="liA8E" id="3489cc5$sN0" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~Graphics.drawOval(int,int,int,int):void" resolve="drawOval" />
+                                <ref role="37wK5l" to="z60i:~Graphics.drawOval(int,int,int,int)" resolve="drawOval" />
                                 <node concept="3cmrfG" id="3489cc5$n78" role="37wK5m">
                                   <property role="3cmrfH" value="4" />
                                 </node>
@@ -26173,7 +26173,7 @@
                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                             </node>
                             <node concept="liA8E" id="3489cc5$sN4" role="2OqNvi">
-                              <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int):void" resolve="fillRect" />
+                              <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
                               <node concept="3cmrfG" id="3489cc5$n6k" role="37wK5m">
                                 <property role="3cmrfH" value="3" />
                               </node>
@@ -26205,7 +26205,7 @@
                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                             </node>
                             <node concept="liA8E" id="3489cc5$sN8" role="2OqNvi">
-                              <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                              <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                               <node concept="3cmrfG" id="3489cc5$n6u" role="37wK5m">
                                 <property role="3cmrfH" value="3" />
                               </node>
@@ -26247,7 +26247,7 @@
                               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                             </node>
                             <node concept="liA8E" id="3489cc5$sNc" role="2OqNvi">
-                              <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                              <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                               <node concept="3cmrfG" id="3489cc5$n6G" role="37wK5m">
                                 <property role="3cmrfH" value="4" />
                               </node>
@@ -26469,7 +26469,7 @@
                         <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                       </node>
                       <node concept="liA8E" id="3489cc5$sNw" role="2OqNvi">
-                        <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                        <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                         <node concept="37vLTw" id="3489cc5$n2N" role="37wK5m">
                           <ref role="3cqZAo" node="3489cc5$lvl" resolve="c_focus" />
                         </node>
@@ -26482,7 +26482,7 @@
                         <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
                       </node>
                       <node concept="liA8E" id="3489cc5$sN$" role="2OqNvi">
-                        <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int):void" resolve="drawRect" />
+                        <ref role="37wK5l" to="z60i:~Graphics.drawRect(int,int,int,int)" resolve="drawRect" />
                         <node concept="3cmrfG" id="3489cc5$n2Q" role="37wK5m">
                           <property role="3cmrfH" value="2" />
                         </node>
@@ -26665,7 +26665,7 @@
               <ref role="3cqZAo" node="3489cc5$mZC" resolve="g" />
             </node>
             <node concept="liA8E" id="3489cc5$sO0" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics.translate(int,int):void" resolve="translate" />
+              <ref role="37wK5l" to="z60i:~Graphics.translate(int,int)" resolve="translate" />
               <node concept="1ZRNhn" id="3489cc5$nUi" role="37wK5m">
                 <node concept="2OqwBi" id="3489cc5$sO3" role="2$L3a6">
                   <node concept="37vLTw" id="3489cc5$sO2" role="2Oq$k0">
@@ -27129,7 +27129,7 @@
               <ref role="3cqZAo" node="3489cc5$nVN" resolve="g" />
             </node>
             <node concept="liA8E" id="3489cc5$sOG" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics.clipRect(int,int,int,int):void" resolve="clipRect" />
+              <ref role="37wK5l" to="z60i:~Graphics.clipRect(int,int,int,int)" resolve="clipRect" />
               <node concept="3cpWs3" id="3489cc5$nWG" role="37wK5m">
                 <node concept="3cmrfG" id="3489cc5$nWH" role="3uHU7B">
                   <property role="3cmrfH" value="1" />
@@ -27217,7 +27217,7 @@
                 <ref role="3cqZAo" node="3489cc5$nVN" resolve="g" />
               </node>
               <node concept="liA8E" id="3489cc5$sOK" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~Graphics.getFontMetrics():java.awt.FontMetrics" resolve="getFontMetrics" />
+                <ref role="37wK5l" to="z60i:~Graphics.getFontMetrics()" resolve="getFontMetrics" />
               </node>
             </node>
           </node>
@@ -27296,7 +27296,7 @@
                           <ref role="3cqZAo" node="3489cc5$nX6" resolve="fm" />
                         </node>
                         <node concept="liA8E" id="3489cc5$sOO" role="2OqNvi">
-                          <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char):int" resolve="charWidth" />
+                          <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char)" resolve="charWidth" />
                           <node concept="1Xhbcc" id="3489cc5$nXA" role="37wK5m">
                             <property role="1XhdNS" value="*" />
                           </node>
@@ -27312,13 +27312,13 @@
                       <ref role="3cqZAo" node="3489cc5$nX6" resolve="fm" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sOS" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                      <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                       <node concept="2OqwBi" id="3489cc5$sOV" role="37wK5m">
                         <node concept="37vLTw" id="3489cc5$sOU" role="2Oq$k0">
                           <ref role="3cqZAo" node="3489cc5$nWS" resolve="text" />
                         </node>
                         <node concept="liA8E" id="3489cc5$sOW" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                          <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                           <node concept="3cmrfG" id="3489cc5$nXF" role="37wK5m">
                             <property role="3cmrfH" value="0" />
                           </node>
@@ -27368,7 +27368,7 @@
                               <ref role="3cqZAo" node="3489cc5$nX6" resolve="fm" />
                             </node>
                             <node concept="liA8E" id="3489cc5$sP0" role="2OqNvi">
-                              <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char):int" resolve="charWidth" />
+                              <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char)" resolve="charWidth" />
                               <node concept="1Xhbcc" id="3489cc5$nXU" role="37wK5m">
                                 <property role="1XhdNS" value="*" />
                               </node>
@@ -27384,13 +27384,13 @@
                           <ref role="3cqZAo" node="3489cc5$nX6" resolve="fm" />
                         </node>
                         <node concept="liA8E" id="3489cc5$sP4" role="2OqNvi">
-                          <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                          <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                           <node concept="2OqwBi" id="3489cc5$sP7" role="37wK5m">
                             <node concept="37vLTw" id="3489cc5$sP6" role="2Oq$k0">
                               <ref role="3cqZAo" node="3489cc5$nWS" resolve="text" />
                             </node>
                             <node concept="liA8E" id="3489cc5$sP8" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                              <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                               <node concept="3cmrfG" id="3489cc5$nXZ" role="37wK5m">
                                 <property role="3cmrfH" value="0" />
                               </node>
@@ -27420,7 +27420,7 @@
                       <ref role="3cqZAo" node="3489cc5$nVN" resolve="g" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sPc" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                      <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                       <node concept="37vLTw" id="3489cc5$nY4" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$lvp" resolve="c_select" />
                       </node>
@@ -27433,7 +27433,7 @@
                       <ref role="3cqZAo" node="3489cc5$nVN" resolve="g" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sPg" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int):void" resolve="fillRect" />
+                      <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
                       <node concept="3cpWs3" id="3489cc5$nY7" role="37wK5m">
                         <node concept="3cpWsd" id="3489cc5$nY8" role="3uHU7B">
                           <node concept="3cpWs3" id="3489cc5$nY9" role="3uHU7B">
@@ -27450,7 +27450,7 @@
                         </node>
                         <node concept="2YIFZM" id="3489cc5$sPi" role="3uHU7w">
                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                          <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                          <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                           <node concept="37vLTw" id="3489cc5$nYe" role="37wK5m">
                             <ref role="3cqZAo" node="3489cc5$nXO" resolve="is" />
                           </node>
@@ -27464,7 +27464,7 @@
                       </node>
                       <node concept="2YIFZM" id="3489cc5$sPk" role="37wK5m">
                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                        <ref role="37wK5l" to="wyt6:~Math.abs(int):int" resolve="abs" />
+                        <ref role="37wK5l" to="wyt6:~Math.abs(int)" resolve="abs" />
                         <node concept="3cpWsd" id="3489cc5$nYi" role="37wK5m">
                           <node concept="37vLTw" id="3489cc5$nYj" role="3uHU7B">
                             <ref role="3cqZAo" node="3489cc5$nXa" resolve="caret" />
@@ -27500,7 +27500,7 @@
                   <ref role="3cqZAo" node="3489cc5$nVN" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sPo" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                   <node concept="37vLTw" id="3489cc5$nYu" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$lvl" resolve="c_focus" />
                   </node>
@@ -27513,7 +27513,7 @@
                   <ref role="3cqZAo" node="3489cc5$nVN" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sPs" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int):void" resolve="fillRect" />
+                  <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
                   <node concept="3cpWs3" id="3489cc5$nYx" role="37wK5m">
                     <node concept="3cpWsd" id="3489cc5$nYy" role="3uHU7B">
                       <node concept="3cpWs3" id="3489cc5$nYz" role="3uHU7B">
@@ -27557,7 +27557,7 @@
               <ref role="3cqZAo" node="3489cc5$nVN" resolve="g" />
             </node>
             <node concept="liA8E" id="3489cc5$sPw" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
               <node concept="3K4zz7" id="3489cc5$nYM" role="37wK5m">
                 <node concept="37vLTw" id="3489cc5$nYJ" role="3K4Cdx">
                   <ref role="3cqZAo" node="3489cc5$nW9" resolve="enabled" />
@@ -27609,7 +27609,7 @@
                         <ref role="3cqZAo" node="3489cc5$nX6" resolve="fm" />
                       </node>
                       <node concept="liA8E" id="3489cc5$sP$" role="2OqNvi">
-                        <ref role="37wK5l" to="z60i:~FontMetrics.getAscent():int" resolve="getAscent" />
+                        <ref role="37wK5l" to="z60i:~FontMetrics.getAscent()" resolve="getAscent" />
                       </node>
                     </node>
                   </node>
@@ -27618,7 +27618,7 @@
                       <ref role="3cqZAo" node="3489cc5$nX6" resolve="fm" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sPC" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~FontMetrics.getDescent():int" resolve="getDescent" />
+                      <ref role="37wK5l" to="z60i:~FontMetrics.getDescent()" resolve="getDescent" />
                     </node>
                   </node>
                 </node>
@@ -27651,7 +27651,7 @@
                     <ref role="3cqZAo" node="3489cc5$nVN" resolve="g" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sPG" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Graphics.drawString(java.lang.String,int,int):void" resolve="drawString" />
+                    <ref role="37wK5l" to="z60i:~Graphics.drawString(java.lang.String,int,int)" resolve="drawString" />
                     <node concept="37vLTw" id="3489cc5$nZD" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$nWS" resolve="text" />
                     </node>
@@ -27687,7 +27687,7 @@
                     <ref role="3cqZAo" node="3489cc5$nX6" resolve="fm" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sPK" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char):int" resolve="charWidth" />
+                    <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char)" resolve="charWidth" />
                     <node concept="1Xhbcc" id="3489cc5$nZe" role="37wK5m">
                       <property role="1XhdNS" value="*" />
                     </node>
@@ -27705,7 +27705,7 @@
                     <ref role="3cqZAo" node="3489cc5$nWS" resolve="text" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sPO" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                    <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                   </node>
                 </node>
               </node>
@@ -27729,7 +27729,7 @@
                       <ref role="3cqZAo" node="3489cc5$nVN" resolve="g" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sPS" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Graphics.drawString(java.lang.String,int,int):void" resolve="drawString" />
+                      <ref role="37wK5l" to="z60i:~Graphics.drawString(java.lang.String,int,int)" resolve="drawString" />
                       <node concept="Xl_RD" id="3489cc5$nZu" role="37wK5m">
                         <property role="Xl_RC" value="*" />
                       </node>
@@ -27772,7 +27772,7 @@
               <ref role="3cqZAo" node="3489cc5$nVN" resolve="g" />
             </node>
             <node concept="liA8E" id="3489cc5$sPW" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int):void" resolve="setClip" />
+              <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int)" resolve="setClip" />
               <node concept="37vLTw" id="3489cc5$nZI" role="37wK5m">
                 <ref role="3cqZAo" node="3489cc5$nVP" resolve="clipx" />
               </node>
@@ -28003,7 +28003,7 @@
                 <node concept="10Oyi0" id="3489cc5$o0L" role="1tU5fm" />
                 <node concept="2YIFZM" id="3489cc5$sQy" role="33vP2m">
                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                  <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                  <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                   <node concept="37vLTw" id="3489cc5$o0N" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$lvy" resolve="block" />
                   </node>
@@ -28062,13 +28062,13 @@
                 <node concept="10Oyi0" id="3489cc5$o12" role="1tU5fm" />
                 <node concept="2YIFZM" id="3489cc5$sQG" role="33vP2m">
                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                  <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                  <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                   <node concept="37vLTw" id="3489cc5$o14" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$o0R" resolve="track" />
                   </node>
                   <node concept="2YIFZM" id="3489cc5$sQI" role="37wK5m">
                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                    <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                    <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                     <node concept="FJ1c_" id="3489cc5$o16" role="37wK5m">
                       <node concept="17qRlL" id="3489cc5$o17" role="3uHU7B">
                         <node concept="37vLTw" id="3489cc5$o18" role="3uHU7B">
@@ -28349,7 +28349,7 @@
                 <node concept="10Oyi0" id="3489cc5$o2y" role="1tU5fm" />
                 <node concept="2YIFZM" id="3489cc5$sR4" role="33vP2m">
                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                  <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                  <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                   <node concept="3cmrfG" id="3489cc5$o2$" role="37wK5m">
                     <property role="3cmrfH" value="5" />
                   </node>
@@ -28377,7 +28377,7 @@
                   <ref role="3cqZAo" node="3489cc5$nZQ" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sR8" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                   <node concept="3K4zz7" id="3489cc5$o2K" role="37wK5m">
                     <node concept="37vLTw" id="3489cc5$o2H" role="3K4Cdx">
                       <ref role="3cqZAo" node="3489cc5$o06" resolve="enabled" />
@@ -28470,7 +28470,7 @@
                       <ref role="3cqZAo" node="3489cc5$nZQ" resolve="g" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sRc" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                      <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                       <node concept="3cpWs3" id="3489cc5$o3k" role="37wK5m">
                         <node concept="37vLTw" id="3489cc5$o3l" role="3uHU7B">
                           <ref role="3cqZAo" node="3489cc5$o2L" resolve="cx" />
@@ -29099,7 +29099,7 @@
                 <node concept="10Oyi0" id="3489cc5$o6p" role="1tU5fm" />
                 <node concept="2YIFZM" id="3489cc5$sSa" role="33vP2m">
                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                  <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                  <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                   <node concept="3cmrfG" id="3489cc5$o6r" role="37wK5m">
                     <property role="3cmrfH" value="5" />
                   </node>
@@ -29127,7 +29127,7 @@
                   <ref role="3cqZAo" node="3489cc5$nZQ" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sSe" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                   <node concept="3K4zz7" id="3489cc5$o6B" role="37wK5m">
                     <node concept="37vLTw" id="3489cc5$o6$" role="3K4Cdx">
                       <ref role="3cqZAo" node="3489cc5$o06" resolve="enabled" />
@@ -29220,7 +29220,7 @@
                       <ref role="3cqZAo" node="3489cc5$nZQ" resolve="g" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sSi" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                      <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                       <node concept="3cpWs3" id="3489cc5$o7b" role="37wK5m">
                         <node concept="37vLTw" id="3489cc5$o7c" role="3uHU7B">
                           <ref role="3cqZAo" node="3489cc5$o4y" resolve="x" />
@@ -29497,7 +29497,7 @@
                   <ref role="3cqZAo" node="3489cc5$nZQ" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sSI" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.clipRect(int,int,int,int):void" resolve="clipRect" />
+                  <ref role="37wK5l" to="z60i:~Graphics.clipRect(int,int,int,int)" resolve="clipRect" />
                   <node concept="3cpWs3" id="3489cc5$o8B" role="37wK5m">
                     <node concept="2OqwBi" id="3489cc5$sSL" role="3uHU7B">
                       <node concept="37vLTw" id="3489cc5$sSK" role="2Oq$k0">
@@ -29559,7 +29559,7 @@
                   <ref role="3cqZAo" node="3489cc5$nZQ" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sT2" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.translate(int,int):void" resolve="translate" />
+                  <ref role="37wK5l" to="z60i:~Graphics.translate(int,int)" resolve="translate" />
                   <node concept="3cpWsd" id="3489cc5$o8P" role="37wK5m">
                     <node concept="3cpWs3" id="3489cc5$o8Q" role="3uHU7B">
                       <node concept="2OqwBi" id="3489cc5$sT5" role="3uHU7B">
@@ -29684,7 +29684,7 @@
               <ref role="3cqZAo" node="3489cc5$o97" resolve="g" />
             </node>
             <node concept="liA8E" id="3489cc5$sTm" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics.translate(int,int):void" resolve="translate" />
+              <ref role="37wK5l" to="z60i:~Graphics.translate(int,int)" resolve="translate" />
               <node concept="3cpWsd" id="3489cc5$o9o" role="37wK5m">
                 <node concept="3cpWsd" id="3489cc5$o9p" role="3uHU7B">
                   <node concept="2OqwBi" id="3489cc5$sTp" role="3uHU7B">
@@ -29740,7 +29740,7 @@
               <ref role="3cqZAo" node="3489cc5$o97" resolve="g" />
             </node>
             <node concept="liA8E" id="3489cc5$sTE" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int):void" resolve="setClip" />
+              <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int)" resolve="setClip" />
               <node concept="37vLTw" id="3489cc5$o9$" role="37wK5m">
                 <ref role="3cqZAo" node="3489cc5$o99" resolve="clipx" />
               </node>
@@ -29866,7 +29866,7 @@
               <ref role="3cqZAo" node="3489cc5$o9G" resolve="g" />
             </node>
             <node concept="liA8E" id="3489cc5$sTI" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
               <node concept="37vLTw" id="3489cc5$oah" role="37wK5m">
                 <ref role="3cqZAo" node="3489cc5$o9Q" resolve="border" />
               </node>
@@ -29884,7 +29884,7 @@
                   <ref role="3cqZAo" node="3489cc5$o9G" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sTM" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                   <node concept="3cpWsd" id="3489cc5$oao" role="37wK5m">
                     <node concept="3cpWs3" id="3489cc5$oap" role="3uHU7B">
                       <node concept="37vLTw" id="3489cc5$oaq" role="3uHU7B">
@@ -29950,7 +29950,7 @@
                   <ref role="3cqZAo" node="3489cc5$o9G" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sTQ" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                   <node concept="37vLTw" id="3489cc5$oaM" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$o9I" resolve="x" />
                   </node>
@@ -30016,7 +30016,7 @@
                   <ref role="3cqZAo" node="3489cc5$o9G" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sTU" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                   <node concept="37vLTw" id="3489cc5$obc" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$o9I" resolve="x" />
                   </node>
@@ -30095,7 +30095,7 @@
                   <ref role="3cqZAo" node="3489cc5$o9G" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sTY" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                  <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                   <node concept="3cpWsd" id="3489cc5$obF" role="37wK5m">
                     <node concept="3cpWs3" id="3489cc5$obG" role="3uHU7B">
                       <node concept="37vLTw" id="3489cc5$obH" role="3uHU7B">
@@ -30185,7 +30185,7 @@
                     <ref role="3cqZAo" node="3489cc5$o9G" resolve="g" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sU2" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                    <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                     <node concept="37vLTw" id="3489cc5$odk" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$o9S" resolve="bg" />
                     </node>
@@ -30198,7 +30198,7 @@
                     <ref role="3cqZAo" node="3489cc5$o9G" resolve="g" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sU6" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int):void" resolve="fillRect" />
+                    <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
                     <node concept="37vLTw" id="3489cc5$odn" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$o9I" resolve="x" />
                     </node>
@@ -30233,7 +30233,7 @@
                       <ref role="3cqZAo" node="3489cc5$o9G" resolve="g" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sUa" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                      <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                       <node concept="37vLTw" id="3489cc5$oci" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$luT" resolve="c_bg" />
                       </node>
@@ -30246,7 +30246,7 @@
                       <ref role="3cqZAo" node="3489cc5$o9G" resolve="g" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sUe" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int):void" resolve="fillRect" />
+                      <ref role="37wK5l" to="z60i:~Graphics.fillRect(int,int,int,int)" resolve="fillRect" />
                       <node concept="37vLTw" id="3489cc5$ocl" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$o9I" resolve="x" />
                       </node>
@@ -30301,7 +30301,7 @@
                       <ref role="3cqZAo" node="3489cc5$o9G" resolve="g" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sUi" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Graphics.drawImage(java.awt.Image,int,int,int,int,int,int,int,int,java.awt.image.ImageObserver):boolean" resolve="drawImage" />
+                      <ref role="37wK5l" to="z60i:~Graphics.drawImage(java.awt.Image,int,int,int,int,int,int,int,int,java.awt.image.ImageObserver)" resolve="drawImage" />
                       <node concept="37vLTw" id="3489cc5$ocF" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$lvA" resolve="gradient" />
                       </node>
@@ -30349,7 +30349,7 @@
                         </node>
                         <node concept="2YIFZM" id="3489cc5$sUk" role="3uHU7w">
                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                          <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                          <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                           <node concept="3cpWs3" id="3489cc5$ocY" role="37wK5m">
                             <node concept="37vLTw" id="3489cc5$ocZ" role="3uHU7B">
                               <ref role="3cqZAo" node="3489cc5$ocs" resolve="i" />
@@ -30379,7 +30379,7 @@
                       </node>
                       <node concept="2YIFZM" id="3489cc5$sUm" role="37wK5m">
                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                        <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                        <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                         <node concept="37vLTw" id="3489cc5$od8" role="37wK5m">
                           <ref role="3cqZAo" node="3489cc5$lvy" resolve="block" />
                         </node>
@@ -30394,7 +30394,7 @@
                       </node>
                       <node concept="2YIFZM" id="3489cc5$sUo" role="37wK5m">
                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                        <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                        <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                         <node concept="37vLTw" id="3489cc5$odd" role="37wK5m">
                           <ref role="3cqZAo" node="3489cc5$lvy" resolve="block" />
                         </node>
@@ -30691,7 +30691,7 @@
               <ref role="3cqZAo" node="3489cc5$odv" resolve="g" />
             </node>
             <node concept="liA8E" id="3489cc5$sUs" role="2OqNvi">
-              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+              <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
               <node concept="3K4zz7" id="3489cc5$oeL" role="37wK5m">
                 <node concept="37vLTw" id="3489cc5$oeI" role="3K4Cdx">
                   <ref role="3cqZAo" node="3489cc5$odF" resolve="enabled" />
@@ -30895,7 +30895,7 @@
                             <ref role="3cqZAo" node="3489cc5$oeY" resolve="g" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sUw" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                            <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                             <node concept="3cpWsd" id="3489cc5$ogW" role="37wK5m">
                               <node concept="3cpWs3" id="3489cc5$ogX" role="3uHU7B">
                                 <node concept="37vLTw" id="3489cc5$ogY" role="3uHU7B">
@@ -30970,7 +30970,7 @@
                           <ref role="3cqZAo" node="3489cc5$oeY" resolve="g" />
                         </node>
                         <node concept="liA8E" id="3489cc5$sU$" role="2OqNvi">
-                          <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                          <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                           <node concept="3cpWsd" id="3489cc5$og$" role="37wK5m">
                             <node concept="3cpWs3" id="3489cc5$og_" role="3uHU7B">
                               <node concept="37vLTw" id="3489cc5$ogA" role="3uHU7B">
@@ -31045,7 +31045,7 @@
                         <ref role="3cqZAo" node="3489cc5$oeY" resolve="g" />
                       </node>
                       <node concept="liA8E" id="3489cc5$sUC" role="2OqNvi">
-                        <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                        <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                         <node concept="3cpWs3" id="3489cc5$ogc" role="37wK5m">
                           <node concept="37vLTw" id="3489cc5$ogd" role="3uHU7B">
                             <ref role="3cqZAo" node="3489cc5$ofb" resolve="cx" />
@@ -31110,7 +31110,7 @@
                       <ref role="3cqZAo" node="3489cc5$oeY" resolve="g" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sUG" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                      <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                       <node concept="3cpWsd" id="3489cc5$ofO" role="37wK5m">
                         <node concept="3cpWs3" id="3489cc5$ofP" role="3uHU7B">
                           <node concept="37vLTw" id="3489cc5$ofQ" role="3uHU7B">
@@ -31399,7 +31399,7 @@
                     <ref role="3cqZAo" node="3489cc5$ohm" resolve="g" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sUK" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Graphics.getFontMetrics():java.awt.FontMetrics" resolve="getFontMetrics" />
+                    <ref role="37wK5l" to="z60i:~Graphics.getFontMetrics()" resolve="getFontMetrics" />
                   </node>
                 </node>
               </node>
@@ -31419,7 +31419,7 @@
                     <ref role="3cqZAo" node="3489cc5$oih" resolve="fm" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sUO" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                    <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                     <node concept="37vLTw" id="3489cc5$oiJ" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$ohJ" resolve="text" />
                     </node>
@@ -31437,7 +31437,7 @@
                     <ref role="3cqZAo" node="3489cc5$oih" resolve="fm" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sUS" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~FontMetrics.getAscent():int" resolve="getAscent" />
+                    <ref role="37wK5l" to="z60i:~FontMetrics.getAscent()" resolve="getAscent" />
                   </node>
                 </node>
               </node>
@@ -31458,7 +31458,7 @@
                       <ref role="3cqZAo" node="3489cc5$oih" resolve="fm" />
                     </node>
                     <node concept="liA8E" id="3489cc5$sUW" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~FontMetrics.getDescent():int" resolve="getDescent" />
+                      <ref role="37wK5l" to="z60i:~FontMetrics.getDescent()" resolve="getDescent" />
                     </node>
                   </node>
                   <node concept="37vLTw" id="3489cc5$oiT" role="3uHU7w">
@@ -31483,7 +31483,7 @@
                   <ref role="3cqZAo" node="3489cc5$ohm" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sV0" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color):void" resolve="setColor" />
+                  <ref role="37wK5l" to="z60i:~Graphics.setColor(java.awt.Color)" resolve="setColor" />
                   <node concept="37vLTw" id="3489cc5$oiW" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$ohC" resolve="fg" />
                   </node>
@@ -31530,7 +31530,7 @@
                     <ref role="3cqZAo" node="3489cc5$ohQ" resolve="icon" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sV4" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver):int" resolve="getWidth" />
+                    <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver)" resolve="getWidth" />
                     <node concept="Xjq3P" id="3489cc5$ojf" role="37wK5m" />
                   </node>
                 </node>
@@ -31546,7 +31546,7 @@
                     <ref role="3cqZAo" node="3489cc5$ohQ" resolve="icon" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sV8" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Image.getHeight(java.awt.image.ImageObserver):int" resolve="getHeight" />
+                    <ref role="37wK5l" to="z60i:~Image.getHeight(java.awt.image.ImageObserver)" resolve="getHeight" />
                     <node concept="Xjq3P" id="3489cc5$ojk" role="37wK5m" />
                   </node>
                 </node>
@@ -31697,7 +31697,7 @@
                   <ref role="3cqZAo" node="3489cc5$ohm" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sVc" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.clipRect(int,int,int,int):void" resolve="clipRect" />
+                  <ref role="37wK5l" to="z60i:~Graphics.clipRect(int,int,int,int)" resolve="clipRect" />
                   <node concept="37vLTw" id="3489cc5$okh" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$ohw" resolve="x" />
                   </node>
@@ -31729,7 +31729,7 @@
                   <ref role="3cqZAo" node="3489cc5$ohm" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sVg" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.drawImage(java.awt.Image,int,int,java.awt.image.ImageObserver):boolean" resolve="drawImage" />
+                  <ref role="37wK5l" to="z60i:~Graphics.drawImage(java.awt.Image,int,int,java.awt.image.ImageObserver)" resolve="drawImage" />
                   <node concept="37vLTw" id="3489cc5$okt" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$ohQ" resolve="icon" />
                   </node>
@@ -31833,7 +31833,7 @@
                   <ref role="3cqZAo" node="3489cc5$ohm" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sVk" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.drawString(java.lang.String,int,int):void" resolve="drawString" />
+                  <ref role="37wK5l" to="z60i:~Graphics.drawString(java.lang.String,int,int)" resolve="drawString" />
                   <node concept="37vLTw" id="3489cc5$ol1" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$ohJ" resolve="text" />
                   </node>
@@ -31906,7 +31906,7 @@
                             <ref role="3cqZAo" node="3489cc5$ohJ" resolve="text" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sVo" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                            <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                           </node>
                         </node>
                       </node>
@@ -31927,13 +31927,13 @@
                               <ref role="3cqZAo" node="3489cc5$oih" resolve="fm" />
                             </node>
                             <node concept="liA8E" id="3489cc5$sVs" role="2OqNvi">
-                              <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String):int" resolve="stringWidth" />
+                              <ref role="37wK5l" to="z60i:~FontMetrics.stringWidth(java.lang.String)" resolve="stringWidth" />
                               <node concept="2OqwBi" id="3489cc5$sVv" role="37wK5m">
                                 <node concept="37vLTw" id="3489cc5$sVu" role="2Oq$k0">
                                   <ref role="3cqZAo" node="3489cc5$ohJ" resolve="text" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$sVw" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                  <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                   <node concept="3cmrfG" id="3489cc5$ol$" role="37wK5m">
                                     <property role="3cmrfH" value="0" />
                                   </node>
@@ -31968,7 +31968,7 @@
                           <ref role="3cqZAo" node="3489cc5$ohm" resolve="g" />
                         </node>
                         <node concept="liA8E" id="3489cc5$sV$" role="2OqNvi">
-                          <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int):void" resolve="drawLine" />
+                          <ref role="37wK5l" to="z60i:~Graphics.drawLine(int,int,int,int)" resolve="drawLine" />
                           <node concept="37vLTw" id="3489cc5$olC" role="37wK5m">
                             <ref role="3cqZAo" node="3489cc5$olt" resolve="mx" />
                           </node>
@@ -31989,13 +31989,13 @@
                                 <ref role="3cqZAo" node="3489cc5$oih" resolve="fm" />
                               </node>
                               <node concept="liA8E" id="3489cc5$sVC" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char):int" resolve="charWidth" />
+                                <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char)" resolve="charWidth" />
                                 <node concept="2OqwBi" id="3489cc5$sVF" role="37wK5m">
                                   <node concept="37vLTw" id="3489cc5$sVE" role="2Oq$k0">
                                     <ref role="3cqZAo" node="3489cc5$ohJ" resolve="text" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$sVG" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                    <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                     <node concept="37vLTw" id="3489cc5$olK" role="37wK5m">
                                       <ref role="3cqZAo" node="3489cc5$ol8" resolve="mnemonic" />
                                     </node>
@@ -32032,7 +32032,7 @@
                   <ref role="3cqZAo" node="3489cc5$ohm" resolve="g" />
                 </node>
                 <node concept="liA8E" id="3489cc5$sVK" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int):void" resolve="setClip" />
+                  <ref role="37wK5l" to="z60i:~Graphics.setClip(int,int,int,int)" resolve="setClip" />
                   <node concept="37vLTw" id="3489cc5$olU" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$oho" resolve="clipx" />
                   </node>
@@ -32073,7 +32073,7 @@
             </node>
             <node concept="2YIFZM" id="3489cc5$sVM" role="3uHU7w">
               <ref role="1Pybhc" to="wyt6:~Thread" resolve="Thread" />
-              <ref role="37wK5l" to="wyt6:~Thread.currentThread():java.lang.Thread" resolve="currentThread" />
+              <ref role="37wK5l" to="wyt6:~Thread.currentThread()" resolve="currentThread" />
             </node>
           </node>
           <node concept="3clFbS" id="3489cc5$om7" role="2LFqv$">
@@ -32107,7 +32107,7 @@
                           <node concept="3cpWsb" id="3489cc5$omn" role="1tU5fm" />
                           <node concept="2YIFZM" id="3489cc5$sVO" role="33vP2m">
                             <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                            <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                            <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
                           </node>
                         </node>
                       </node>
@@ -32253,7 +32253,7 @@
                         <node concept="3clFbS" id="3489cc5$omu" role="3clFbx">
                           <node concept="3clFbF" id="3489cc5$omv" role="3cqZAp">
                             <node concept="1rXfSq" id="3489cc5$omw" role="3clFbG">
-                              <ref role="37wK5l" to="wyt6:~Object.wait(long):void" resolve="wait" />
+                              <ref role="37wK5l" to="wyt6:~Object.wait(long)" resolve="wait" />
                               <node concept="3cpWsd" id="3489cc5$omx" role="37wK5m">
                                 <node concept="37vLTw" id="3489cc5$omy" role="3uHU7B">
                                   <ref role="3cqZAo" node="3489cc5$lw6" resolve="watch" />
@@ -32271,7 +32271,7 @@
                   <node concept="3clFbS" id="3489cc5$omf" role="3clFbx">
                     <node concept="3clFbF" id="3489cc5$omg" role="3cqZAp">
                       <node concept="1rXfSq" id="3489cc5$omh" role="3clFbG">
-                        <ref role="37wK5l" to="wyt6:~Object.wait(long):void" resolve="wait" />
+                        <ref role="37wK5l" to="wyt6:~Object.wait(long)" resolve="wait" />
                         <node concept="3cmrfG" id="3489cc5$omi" role="37wK5m">
                           <property role="3cmrfH" value="0" />
                         </node>
@@ -32348,7 +32348,7 @@
                   <node concept="3cpWs3" id="3489cc5$oo2" role="37vLTx">
                     <node concept="2YIFZM" id="3489cc5$sVQ" role="3uHU7B">
                       <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-                      <ref role="37wK5l" to="wyt6:~System.currentTimeMillis():long" resolve="currentTimeMillis" />
+                      <ref role="37wK5l" to="wyt6:~System.currentTimeMillis()" resolve="currentTimeMillis" />
                     </node>
                     <node concept="37vLTw" id="3489cc5$oo4" role="3uHU7w">
                       <ref role="3cqZAo" node="3489cc5$onC" resolve="delay" />
@@ -32383,7 +32383,7 @@
                         <ref role="3cqZAo" node="3489cc5$lvY" resolve="timer" />
                       </node>
                       <node concept="liA8E" id="3489cc5$sWa" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Thread.setPriority(int):void" resolve="setPriority" />
+                        <ref role="37wK5l" to="wyt6:~Thread.setPriority(int)" resolve="setPriority" />
                         <node concept="10M0yZ" id="3489cc5$SXs" role="37wK5m">
                           <ref role="1PxDUh" to="wyt6:~Thread" resolve="Thread" />
                           <ref role="3cqZAo" to="wyt6:~Thread.MIN_PRIORITY" resolve="MIN_PRIORITY" />
@@ -32397,7 +32397,7 @@
                         <ref role="3cqZAo" node="3489cc5$lvY" resolve="timer" />
                       </node>
                       <node concept="liA8E" id="3489cc5$sWg" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Thread.setDaemon(boolean):void" resolve="setDaemon" />
+                        <ref role="37wK5l" to="wyt6:~Thread.setDaemon(boolean)" resolve="setDaemon" />
                         <node concept="3clFbT" id="3489cc5$ool" role="37wK5m">
                           <property role="3clFbU" value="true" />
                         </node>
@@ -32410,7 +32410,7 @@
                         <ref role="3cqZAo" node="3489cc5$lvY" resolve="timer" />
                       </node>
                       <node concept="liA8E" id="3489cc5$sWk" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Thread.start():void" resolve="start" />
+                        <ref role="37wK5l" to="wyt6:~Thread.start()" resolve="start" />
                       </node>
                     </node>
                   </node>
@@ -32445,7 +32445,7 @@
                     <node concept="3clFbS" id="3489cc5$ooA" role="1HWHxc">
                       <node concept="3clFbF" id="3489cc5$ooB" role="3cqZAp">
                         <node concept="1rXfSq" id="3489cc5$ooC" role="3clFbG">
-                          <ref role="37wK5l" to="wyt6:~Object.notify():void" resolve="notify" />
+                          <ref role="37wK5l" to="wyt6:~Object.notify()" resolve="notify" />
                         </node>
                       </node>
                     </node>
@@ -32526,7 +32526,7 @@
                 <ref role="3cqZAo" node="3489cc5$ooP" resolve="e" />
               </node>
               <node concept="liA8E" id="3489cc5$sWo" role="2OqNvi">
-                <ref role="37wK5l" to="z60i:~AWTEvent.getID():int" resolve="getID" />
+                <ref role="37wK5l" to="z60i:~AWTEvent.getID()" resolve="getID" />
               </node>
             </node>
           </node>
@@ -32679,7 +32679,7 @@
                             <ref role="3uigEE" to="z60i:~Dimension" resolve="Dimension" />
                           </node>
                           <node concept="1rXfSq" id="3489cc5$o_D" role="33vP2m">
-                            <ref role="37wK5l" to="z60i:~Component.getSize():java.awt.Dimension" resolve="getSize" />
+                            <ref role="37wK5l" to="z60i:~Component.getSize()" resolve="getSize" />
                           </node>
                         </node>
                       </node>
@@ -32743,7 +32743,7 @@
                         <node concept="3clFbS" id="3489cc5$o_V" role="3clFbx">
                           <node concept="3clFbF" id="3489cc5$o_W" role="3cqZAp">
                             <node concept="1rXfSq" id="3489cc5$o_X" role="3clFbG">
-                              <ref role="37wK5l" to="z60i:~Component.requestFocus():void" resolve="requestFocus" />
+                              <ref role="37wK5l" to="z60i:~Component.requestFocus()" resolve="requestFocus" />
                             </node>
                           </node>
                         </node>
@@ -32889,7 +32889,7 @@
                             <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                           </node>
                           <node concept="liA8E" id="3489cc5$sWO" role="2OqNvi">
-                            <ref role="37wK5l" to="hyam:~KeyEvent.getKeyChar():char" resolve="getKeyChar" />
+                            <ref role="37wK5l" to="hyam:~KeyEvent.getKeyChar()" resolve="getKeyChar" />
                           </node>
                         </node>
                       </node>
@@ -32953,7 +32953,7 @@
                               <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                             </node>
                             <node concept="liA8E" id="3489cc5$sWS" role="2OqNvi">
-                              <ref role="37wK5l" to="hyam:~InputEvent.isControlDown():boolean" resolve="isControlDown" />
+                              <ref role="37wK5l" to="hyam:~InputEvent.isControlDown()" resolve="isControlDown" />
                             </node>
                           </node>
                         </node>
@@ -32991,7 +32991,7 @@
                                   <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$sWY" role="2OqNvi">
-                                  <ref role="37wK5l" to="hyam:~KeyEvent.getKeyCode():int" resolve="getKeyCode" />
+                                  <ref role="37wK5l" to="hyam:~KeyEvent.getKeyCode()" resolve="getKeyCode" />
                                 </node>
                               </node>
                               <node concept="3cmrfG" id="3489cc5$oy$" role="3K4GZi">
@@ -33025,7 +33025,7 @@
                                   <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$sX2" role="2OqNvi">
-                                  <ref role="37wK5l" to="hyam:~InputEvent.isShiftDown():boolean" resolve="isShiftDown" />
+                                  <ref role="37wK5l" to="hyam:~InputEvent.isShiftDown()" resolve="isShiftDown" />
                                 </node>
                               </node>
                               <node concept="2OqwBi" id="3489cc5$sX5" role="37wK5m">
@@ -33033,7 +33033,7 @@
                                   <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$sX6" role="2OqNvi">
-                                  <ref role="37wK5l" to="hyam:~InputEvent.isControlDown():boolean" resolve="isControlDown" />
+                                  <ref role="37wK5l" to="hyam:~InputEvent.isControlDown()" resolve="isControlDown" />
                                 </node>
                               </node>
                               <node concept="2OqwBi" id="3489cc5$sX9" role="37wK5m">
@@ -33041,7 +33041,7 @@
                                   <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$sXa" role="2OqNvi">
-                                  <ref role="37wK5l" to="hyam:~InputEvent.getModifiers():int" resolve="getModifiers" />
+                                  <ref role="37wK5l" to="hyam:~InputEvent.getModifiers()" resolve="getModifiers" />
                                 </node>
                               </node>
                               <node concept="3K4zz7" id="3489cc5$oyQ" role="37wK5m">
@@ -33066,7 +33066,7 @@
                                 <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                               </node>
                               <node concept="liA8E" id="3489cc5$sXe" role="2OqNvi">
-                                <ref role="37wK5l" to="hyam:~InputEvent.consume():void" resolve="consume" />
+                                <ref role="37wK5l" to="hyam:~InputEvent.consume()" resolve="consume" />
                               </node>
                             </node>
                           </node>
@@ -33104,7 +33104,7 @@
                                             <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$sXm" role="2OqNvi">
-                                            <ref role="37wK5l" to="hyam:~InputEvent.isAltDown():boolean" resolve="isAltDown" />
+                                            <ref role="37wK5l" to="hyam:~InputEvent.isAltDown()" resolve="isAltDown" />
                                           </node>
                                         </node>
                                         <node concept="2OqwBi" id="3489cc5$sXp" role="3uHU7w">
@@ -33112,7 +33112,7 @@
                                             <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$sXq" role="2OqNvi">
-                                            <ref role="37wK5l" to="hyam:~InputEvent.isControlDown():boolean" resolve="isControlDown" />
+                                            <ref role="37wK5l" to="hyam:~InputEvent.isControlDown()" resolve="isControlDown" />
                                           </node>
                                         </node>
                                       </node>
@@ -33228,7 +33228,7 @@
                                           <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$sXy" role="2OqNvi">
-                                          <ref role="37wK5l" to="hyam:~InputEvent.isShiftDown():boolean" resolve="isShiftDown" />
+                                          <ref role="37wK5l" to="hyam:~InputEvent.isShiftDown()" resolve="isShiftDown" />
                                         </node>
                                       </node>
                                     </node>
@@ -33273,7 +33273,7 @@
                                               <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$sXA" role="2OqNvi">
-                                              <ref role="37wK5l" to="hyam:~InputEvent.isShiftDown():boolean" resolve="isShiftDown" />
+                                              <ref role="37wK5l" to="hyam:~InputEvent.isShiftDown()" resolve="isShiftDown" />
                                             </node>
                                           </node>
                                         </node>
@@ -33301,10 +33301,10 @@
                                                   <node concept="2OqwBi" id="3489cc5$ozN" role="3clFbG">
                                                     <node concept="2OqwBi" id="3489cc5$ozO" role="2Oq$k0">
                                                       <node concept="1rXfSq" id="3489cc5$ozP" role="2Oq$k0">
-                                                        <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                                                        <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                                                       </node>
                                                       <node concept="liA8E" id="3489cc5$ozQ" role="2OqNvi">
-                                                        <ref role="37wK5l" to="wyt6:~Class.getMethod(java.lang.String,java.lang.Class...):java.lang.reflect.Method" resolve="getMethod" />
+                                                        <ref role="37wK5l" to="wyt6:~Class.getMethod(java.lang.String,java.lang.Class...)" resolve="getMethod" />
                                                         <node concept="Xl_RD" id="3489cc5$ozR" role="37wK5m">
                                                           <property role="Xl_RC" value="transferFocusBackward" />
                                                         </node>
@@ -33312,7 +33312,7 @@
                                                       </node>
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$ozT" role="2OqNvi">
-                                                      <ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...):java.lang.Object" resolve="invoke" />
+                                                      <ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...)" resolve="invoke" />
                                                       <node concept="Xjq3P" id="3489cc5$ozU" role="37wK5m" />
                                                       <node concept="10Nm6u" id="3489cc5$ozV" role="37wK5m" />
                                                     </node>
@@ -33325,7 +33325,7 @@
                                         <node concept="3clFbS" id="3489cc5$ozF" role="3clFbx">
                                           <node concept="3clFbF" id="3489cc5$ozG" role="3cqZAp">
                                             <node concept="1rXfSq" id="3489cc5$ozH" role="3clFbG">
-                                              <ref role="37wK5l" to="z60i:~Component.transferFocus():void" resolve="transferFocus" />
+                                              <ref role="37wK5l" to="z60i:~Component.transferFocus()" resolve="transferFocus" />
                                             </node>
                                           </node>
                                         </node>
@@ -33339,7 +33339,7 @@
                                           <ref role="3cqZAo" node="3489cc5$oxN" resolve="ke" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$sXE" role="2OqNvi">
-                                          <ref role="37wK5l" to="hyam:~InputEvent.consume():void" resolve="consume" />
+                                          <ref role="37wK5l" to="hyam:~InputEvent.consume()" resolve="consume" />
                                         </node>
                                       </node>
                                     </node>
@@ -33505,11 +33505,11 @@
                                     <ref role="3cqZAo" node="3489cc5$ooP" resolve="e" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$sXI" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                                    <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                                   </node>
                                 </node>
                                 <node concept="liA8E" id="3489cc5$owt" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~Class.getMethod(java.lang.String,java.lang.Class...):java.lang.reflect.Method" resolve="getMethod" />
+                                  <ref role="37wK5l" to="wyt6:~Class.getMethod(java.lang.String,java.lang.Class...)" resolve="getMethod" />
                                   <node concept="Xl_RD" id="3489cc5$owu" role="37wK5m">
                                     <property role="Xl_RC" value="getWheelRotation" />
                                   </node>
@@ -33533,7 +33533,7 @@
                                     <ref role="3cqZAo" node="3489cc5$lxo" resolve="wheelrotation" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$sXM" role="2OqNvi">
-                                    <ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...):java.lang.Object" resolve="invoke" />
+                                    <ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...)" resolve="invoke" />
                                     <node concept="37vLTw" id="3489cc5$owA" role="37wK5m">
                                       <ref role="3cqZAo" node="3489cc5$ooP" resolve="e" />
                                     </node>
@@ -33546,7 +33546,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="3489cc5$owE" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~Integer.intValue():int" resolve="intValue" />
+                              <ref role="37wK5l" to="wyt6:~Integer.intValue()" resolve="intValue" />
                             </node>
                           </node>
                         </node>
@@ -33711,7 +33711,7 @@
                     <ref role="3cqZAo" node="3489cc5$op8" resolve="me" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sYe" role="2OqNvi">
-                    <ref role="37wK5l" to="hyam:~MouseEvent.getX():int" resolve="getX" />
+                    <ref role="37wK5l" to="hyam:~MouseEvent.getX()" resolve="getX" />
                   </node>
                 </node>
               </node>
@@ -33726,7 +33726,7 @@
                     <ref role="3cqZAo" node="3489cc5$op8" resolve="me" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sYi" role="2OqNvi">
-                    <ref role="37wK5l" to="hyam:~MouseEvent.getY():int" resolve="getY" />
+                    <ref role="37wK5l" to="hyam:~MouseEvent.getY()" resolve="getY" />
                   </node>
                 </node>
               </node>
@@ -33741,7 +33741,7 @@
                     <ref role="3cqZAo" node="3489cc5$op8" resolve="me" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sYm" role="2OqNvi">
-                    <ref role="37wK5l" to="hyam:~MouseEvent.getClickCount():int" resolve="getClickCount" />
+                    <ref role="37wK5l" to="hyam:~MouseEvent.getClickCount()" resolve="getClickCount" />
                   </node>
                 </node>
               </node>
@@ -33756,7 +33756,7 @@
                     <ref role="3cqZAo" node="3489cc5$op8" resolve="me" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sYq" role="2OqNvi">
-                    <ref role="37wK5l" to="hyam:~InputEvent.isShiftDown():boolean" resolve="isShiftDown" />
+                    <ref role="37wK5l" to="hyam:~InputEvent.isShiftDown()" resolve="isShiftDown" />
                   </node>
                 </node>
               </node>
@@ -33771,7 +33771,7 @@
                     <ref role="3cqZAo" node="3489cc5$op8" resolve="me" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sYu" role="2OqNvi">
-                    <ref role="37wK5l" to="hyam:~InputEvent.isControlDown():boolean" resolve="isControlDown" />
+                    <ref role="37wK5l" to="hyam:~InputEvent.isControlDown()" resolve="isControlDown" />
                   </node>
                 </node>
               </node>
@@ -33786,7 +33786,7 @@
                     <ref role="3cqZAo" node="3489cc5$op8" resolve="me" />
                   </node>
                   <node concept="liA8E" id="3489cc5$sYy" role="2OqNvi">
-                    <ref role="37wK5l" to="hyam:~MouseEvent.isPopupTrigger():boolean" resolve="isPopupTrigger" />
+                    <ref role="37wK5l" to="hyam:~MouseEvent.isPopupTrigger()" resolve="isPopupTrigger" />
                   </node>
                 </node>
               </node>
@@ -36535,7 +36535,7 @@
                                             </node>
                                             <node concept="2YIFZM" id="3489cc5$sZM" role="37vLTx">
                                               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                              <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                              <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                               <node concept="37vLTw" id="3489cc5$oSt" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$oR0" resolve="d" />
                                               </node>
@@ -36557,7 +36557,7 @@
                                       </node>
                                       <node concept="2YIFZM" id="3489cc5$sZO" role="37vLTx">
                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                        <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                        <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                         <node concept="1ZRNhn" id="3489cc5$oRv" role="37wK5m">
                                           <node concept="3cmrfG" id="3489cc5$oRw" role="2$L3a6">
                                             <property role="3cmrfH" value="10" />
@@ -36834,7 +36834,7 @@
                                           </node>
                                           <node concept="2YIFZM" id="3489cc5$t0c" role="37vLTx">
                                             <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                            <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                            <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                             <node concept="37vLTw" id="3489cc5$oQo" role="37wK5m">
                                               <ref role="3cqZAo" node="3489cc5$oOh" resolve="d" />
                                             </node>
@@ -36863,7 +36863,7 @@
                                         </node>
                                         <node concept="2YIFZM" id="3489cc5$t0e" role="37vLTx">
                                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                          <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                          <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                           <node concept="37vLTw" id="3489cc5$oQ9" role="37wK5m">
                                             <ref role="3cqZAo" node="3489cc5$oOh" resolve="d" />
                                           </node>
@@ -36954,7 +36954,7 @@
                                         </node>
                                         <node concept="2YIFZM" id="3489cc5$t0m" role="37vLTx">
                                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                           <node concept="37vLTw" id="3489cc5$oPk" role="37wK5m">
                                             <ref role="3cqZAo" node="3489cc5$oOh" resolve="d" />
                                           </node>
@@ -36985,7 +36985,7 @@
                                       </node>
                                       <node concept="2YIFZM" id="3489cc5$t0o" role="37vLTx">
                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                        <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                        <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                         <node concept="37vLTw" id="3489cc5$oP4" role="37wK5m">
                                           <ref role="3cqZAo" node="3489cc5$oOh" resolve="d" />
                                         </node>
@@ -37643,7 +37643,7 @@
                                       <ref role="3cqZAo" node="3489cc5$oFn" resolve="text" />
                                     </node>
                                     <node concept="liA8E" id="3489cc5$t0U" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~String.indexOf(int,int):int" resolve="indexOf" />
+                                      <ref role="37wK5l" to="wyt6:~String.indexOf(int,int)" resolve="indexOf" />
                                       <node concept="1Xhbcc" id="3489cc5$oJi" role="37wK5m">
                                         <property role="1XhdNS" value="\n" />
                                       </node>
@@ -37695,7 +37695,7 @@
                                               <ref role="3cqZAo" node="3489cc5$oFn" resolve="text" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$t0Y" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                              <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                               <node concept="3cpWsd" id="3489cc5$oJA" role="37wK5m">
                                                 <node concept="37vLTw" id="3489cc5$oJB" role="3uHU7B">
                                                   <ref role="3cqZAo" node="3489cc5$oJr" resolve="prev" />
@@ -37755,13 +37755,13 @@
                                             </node>
                                             <node concept="2OqwBi" id="3489cc5$oK0" role="3uHU7w">
                                               <node concept="1rXfSq" id="3489cc5$oK1" role="2Oq$k0">
-                                                <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font):java.awt.FontMetrics" resolve="getFontMetrics" />
+                                                <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
                                                 <node concept="1rXfSq" id="3489cc5$oK2" role="37wK5m">
-                                                  <ref role="37wK5l" to="z60i:~Component.getFont():java.awt.Font" resolve="getFont" />
+                                                  <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="3489cc5$oK3" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~FontMetrics.getHeight():int" resolve="getHeight" />
+                                                <ref role="37wK5l" to="z60i:~FontMetrics.getHeight()" resolve="getHeight" />
                                               </node>
                                             </node>
                                           </node>
@@ -37799,7 +37799,7 @@
                                                       <ref role="3cqZAo" node="3489cc5$oFn" resolve="text" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$t14" role="2OqNvi">
-                                                      <ref role="37wK5l" to="wyt6:~String.indexOf(int,int):int" resolve="indexOf" />
+                                                      <ref role="37wK5l" to="wyt6:~String.indexOf(int,int)" resolve="indexOf" />
                                                       <node concept="1Xhbcc" id="3489cc5$oKi" role="37wK5m">
                                                         <property role="1XhdNS" value="\n" />
                                                       </node>
@@ -37853,7 +37853,7 @@
                                           <ref role="3cqZAo" node="3489cc5$oFn" resolve="text" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$t18" role="2OqNvi">
-                                          <ref role="37wK5l" to="wyt6:~String.indexOf(int,int):int" resolve="indexOf" />
+                                          <ref role="37wK5l" to="wyt6:~String.indexOf(int,int)" resolve="indexOf" />
                                           <node concept="1Xhbcc" id="3489cc5$oKB" role="37wK5m">
                                             <property role="1XhdNS" value="\n" />
                                           </node>
@@ -37876,7 +37876,7 @@
                                       </node>
                                       <node concept="2YIFZM" id="3489cc5$t1a" role="37vLTx">
                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                         <node concept="3cpWsd" id="3489cc5$oKJ" role="37wK5m">
                                           <node concept="3cpWs3" id="3489cc5$oKK" role="3uHU7B">
                                             <node concept="3cpWs3" id="3489cc5$oKL" role="3uHU7B">
@@ -37915,7 +37915,7 @@
                                                   <ref role="3cqZAo" node="3489cc5$oFn" resolve="text" />
                                                 </node>
                                                 <node concept="liA8E" id="3489cc5$t1e" role="2OqNvi">
-                                                  <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                                  <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                                                 </node>
                                               </node>
                                               <node concept="3cmrfG" id="3489cc5$oKX" role="3uHU7w">
@@ -37983,7 +37983,7 @@
                                         <ref role="3cqZAo" node="3489cc5$oFn" resolve="text" />
                                       </node>
                                       <node concept="liA8E" id="3489cc5$t1i" role="2OqNvi">
-                                        <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                        <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                         <node concept="3cpWsd" id="3489cc5$oHo" role="37wK5m">
                                           <node concept="37vLTw" id="3489cc5$oHp" role="3uHU7B">
                                             <ref role="3cqZAo" node="3489cc5$oHd" resolve="prev" />
@@ -38070,13 +38070,13 @@
                                           </node>
                                           <node concept="2OqwBi" id="3489cc5$oHW" role="3uHU7w">
                                             <node concept="1rXfSq" id="3489cc5$oHX" role="2Oq$k0">
-                                              <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font):java.awt.FontMetrics" resolve="getFontMetrics" />
+                                              <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
                                               <node concept="1rXfSq" id="3489cc5$oHY" role="37wK5m">
-                                                <ref role="37wK5l" to="z60i:~Component.getFont():java.awt.Font" resolve="getFont" />
+                                                <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="3489cc5$oHZ" role="2OqNvi">
-                                              <ref role="37wK5l" to="z60i:~FontMetrics.getHeight():int" resolve="getHeight" />
+                                              <ref role="37wK5l" to="z60i:~FontMetrics.getHeight()" resolve="getHeight" />
                                             </node>
                                           </node>
                                         </node>
@@ -38164,7 +38164,7 @@
                                                 <ref role="3cqZAo" node="3489cc5$oFn" resolve="text" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$t1o" role="2OqNvi">
-                                                <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                                <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                                 <node concept="3cpWsd" id="3489cc5$oIz" role="37wK5m">
                                                   <node concept="37vLTw" id="3489cc5$oI$" role="3uHU7B">
                                                     <ref role="3cqZAo" node="3489cc5$oI3" resolve="first" />
@@ -38200,7 +38200,7 @@
                                     </node>
                                     <node concept="2YIFZM" id="3489cc5$t1q" role="37vLTx">
                                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                      <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                      <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                       <node concept="3cpWs3" id="3489cc5$oIN" role="37wK5m">
                                         <node concept="37vLTw" id="3489cc5$oIO" role="3uHU7B">
                                           <ref role="3cqZAo" node="3489cc5$oI3" resolve="first" />
@@ -38254,7 +38254,7 @@
                                   <ref role="3cqZAo" node="3489cc5$oFn" resolve="text" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$t1u" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.indexOf(int,int):int" resolve="indexOf" />
+                                  <ref role="37wK5l" to="wyt6:~String.indexOf(int,int)" resolve="indexOf" />
                                   <node concept="1Xhbcc" id="3489cc5$oGF" role="37wK5m">
                                     <property role="1XhdNS" value="\n" />
                                   </node>
@@ -38287,7 +38287,7 @@
                                       <ref role="3cqZAo" node="3489cc5$oFn" resolve="text" />
                                     </node>
                                     <node concept="liA8E" id="3489cc5$t1y" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                      <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                                     </node>
                                   </node>
                                 </node>
@@ -38335,7 +38335,7 @@
                                     <ref role="3cqZAo" node="3489cc5$oFn" resolve="text" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$t1A" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                    <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                     <node concept="3cpWsd" id="3489cc5$oG9" role="37wK5m">
                                       <node concept="37vLTw" id="3489cc5$oGa" role="3uHU7B">
                                         <ref role="3cqZAo" node="3489cc5$oFK" resolve="iend" />
@@ -39398,7 +39398,7 @@
                           <ref role="3cqZAo" node="3489cc5$p16" resolve="group" />
                         </node>
                         <node concept="liA8E" id="3489cc5$t2k" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                           <node concept="1rXfSq" id="3489cc5$p20" role="37wK5m">
                             <ref role="37wK5l" node="3489cc5$qCx" resolve="get" />
                             <node concept="37vLTw" id="3489cc5$p21" role="37wK5m">
@@ -40273,19 +40273,19 @@
                                               <node concept="2OqwBi" id="3489cc5$paY" role="2Oq$k0">
                                                 <node concept="2OqwBi" id="3489cc5$paZ" role="2Oq$k0">
                                                   <node concept="1rXfSq" id="3489cc5$pb0" role="2Oq$k0">
-                                                    <ref role="37wK5l" to="z60i:~Component.getToolkit():java.awt.Toolkit" resolve="getToolkit" />
+                                                    <ref role="37wK5l" to="z60i:~Component.getToolkit()" resolve="getToolkit" />
                                                   </node>
                                                   <node concept="liA8E" id="3489cc5$pb1" role="2OqNvi">
-                                                    <ref role="37wK5l" to="z60i:~Toolkit.getSystemClipboard():java.awt.datatransfer.Clipboard" resolve="getSystemClipboard" />
+                                                    <ref role="37wK5l" to="z60i:~Toolkit.getSystemClipboard()" resolve="getSystemClipboard" />
                                                   </node>
                                                 </node>
                                                 <node concept="liA8E" id="3489cc5$pb2" role="2OqNvi">
-                                                  <ref role="37wK5l" to="kt01:~Clipboard.getContents(java.lang.Object):java.awt.datatransfer.Transferable" resolve="getContents" />
+                                                  <ref role="37wK5l" to="kt01:~Clipboard.getContents(java.lang.Object)" resolve="getContents" />
                                                   <node concept="Xjq3P" id="3489cc5$pb3" role="37wK5m" />
                                                 </node>
                                               </node>
                                               <node concept="liA8E" id="3489cc5$pb4" role="2OqNvi">
-                                                <ref role="37wK5l" to="kt01:~Transferable.getTransferData(java.awt.datatransfer.DataFlavor):java.lang.Object" resolve="getTransferData" />
+                                                <ref role="37wK5l" to="kt01:~Transferable.getTransferData(java.awt.datatransfer.DataFlavor)" resolve="getTransferData" />
                                                 <node concept="10M0yZ" id="3489cc5$SZ7" role="37wK5m">
                                                   <ref role="1PxDUh" to="kt01:~DataFlavor" resolve="DataFlavor" />
                                                   <ref role="3cqZAo" to="kt01:~DataFlavor.stringFlavor" resolve="stringFlavor" />
@@ -40325,7 +40325,7 @@
                                               <ref role="3cqZAo" node="3489cc5$p58" resolve="insert" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$teY" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                              <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                                             </node>
                                           </node>
                                         </node>
@@ -40350,7 +40350,7 @@
                                           <ref role="3cqZAo" node="3489cc5$p58" resolve="insert" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$tf2" role="2OqNvi">
-                                          <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                          <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                                         </node>
                                       </node>
                                     </node>
@@ -40370,7 +40370,7 @@
                                               <ref role="3cqZAo" node="3489cc5$p58" resolve="insert" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$tf6" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                              <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                               <node concept="37vLTw" id="3489cc5$pbC" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$pbo" resolve="i" />
                                               </node>
@@ -40455,7 +40455,7 @@
                                                 <ref role="3cqZAo" node="3489cc5$pbi" resolve="filtered" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$tfa" role="2OqNvi">
-                                                <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                                <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                                 <node concept="37vLTw" id="3489cc5$pcb" role="37wK5m">
                                                   <ref role="3cqZAo" node="3489cc5$pb$" resolve="ckey" />
                                                 </node>
@@ -40473,7 +40473,7 @@
                                           <ref role="3cqZAo" node="3489cc5$pbi" resolve="filtered" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$tfe" role="2OqNvi">
-                                          <ref role="37wK5l" to="wyt6:~StringBuffer.length():int" resolve="length" />
+                                          <ref role="37wK5l" to="wyt6:~StringBuffer.length()" resolve="length" />
                                         </node>
                                       </node>
                                       <node concept="2OqwBi" id="3489cc5$tfh" role="3uHU7w">
@@ -40481,7 +40481,7 @@
                                           <ref role="3cqZAo" node="3489cc5$p58" resolve="insert" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$tfi" role="2OqNvi">
-                                          <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                          <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                                         </node>
                                       </node>
                                     </node>
@@ -40496,7 +40496,7 @@
                                               <ref role="3cqZAo" node="3489cc5$pbi" resolve="filtered" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$tfm" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~StringBuffer.toString():java.lang.String" resolve="toString" />
+                                              <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
                                             </node>
                                           </node>
                                         </node>
@@ -40526,10 +40526,10 @@
                                             <ref role="3cqZAo" node="3489cc5$p4$" resolve="text" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$tfq" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                                            <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                                             <node concept="2YIFZM" id="3489cc5$tfs" role="37wK5m">
                                               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                              <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                              <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                               <node concept="37vLTw" id="3489cc5$pab" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$p4F" resolve="start" />
                                               </node>
@@ -40539,7 +40539,7 @@
                                             </node>
                                             <node concept="2YIFZM" id="3489cc5$tfu" role="37wK5m">
                                               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                               <node concept="37vLTw" id="3489cc5$pae" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$p4F" resolve="start" />
                                               </node>
@@ -40622,14 +40622,14 @@
                                           <node concept="2OqwBi" id="3489cc5$paj" role="3clFbG">
                                             <node concept="2OqwBi" id="3489cc5$pak" role="2Oq$k0">
                                               <node concept="1rXfSq" id="3489cc5$pal" role="2Oq$k0">
-                                                <ref role="37wK5l" to="z60i:~Component.getToolkit():java.awt.Toolkit" resolve="getToolkit" />
+                                                <ref role="37wK5l" to="z60i:~Component.getToolkit()" resolve="getToolkit" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$pam" role="2OqNvi">
-                                                <ref role="37wK5l" to="z60i:~Toolkit.getSystemClipboard():java.awt.datatransfer.Clipboard" resolve="getSystemClipboard" />
+                                                <ref role="37wK5l" to="z60i:~Toolkit.getSystemClipboard()" resolve="getSystemClipboard" />
                                               </node>
                                             </node>
                                             <node concept="liA8E" id="3489cc5$pan" role="2OqNvi">
-                                              <ref role="37wK5l" to="kt01:~Clipboard.setContents(java.awt.datatransfer.Transferable,java.awt.datatransfer.ClipboardOwner):void" resolve="setContents" />
+                                              <ref role="37wK5l" to="kt01:~Clipboard.setContents(java.awt.datatransfer.Transferable,java.awt.datatransfer.ClipboardOwner)" resolve="setContents" />
                                               <node concept="2ShNRf" id="3489cc5$tfv" role="37wK5m">
                                                 <node concept="1pGfFk" id="3489cc5$tfw" role="2ShVmc">
                                                   <ref role="37wK5l" to="kt01:~StringSelection.&lt;init&gt;(java.lang.String)" resolve="StringSelection" />
@@ -40691,7 +40691,7 @@
                                         <ref role="3cqZAo" node="3489cc5$p4$" resolve="text" />
                                       </node>
                                       <node concept="liA8E" id="3489cc5$tfA" role="2OqNvi">
-                                        <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                        <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                                       </node>
                                     </node>
                                   </node>
@@ -40730,7 +40730,7 @@
                                     <ref role="3cqZAo" node="3489cc5$p4$" resolve="text" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$tfE" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                    <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                                   </node>
                                 </node>
                               </node>
@@ -40832,7 +40832,7 @@
                                             <ref role="3cqZAo" node="3489cc5$p4$" resolve="text" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$tfI" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                                            <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                                           </node>
                                         </node>
                                       </node>
@@ -40851,13 +40851,13 @@
                                         </node>
                                         <node concept="2YIFZM" id="3489cc5$tfK" role="3uHU7w">
                                           <ref role="1Pybhc" to="wyt6:~Character" resolve="Character" />
-                                          <ref role="37wK5l" to="wyt6:~Character.isLetterOrDigit(char):boolean" resolve="isLetterOrDigit" />
+                                          <ref role="37wK5l" to="wyt6:~Character.isLetterOrDigit(char)" resolve="isLetterOrDigit" />
                                           <node concept="2OqwBi" id="3489cc5$tfN" role="37wK5m">
                                             <node concept="37vLTw" id="3489cc5$tfM" role="2Oq$k0">
                                               <ref role="3cqZAo" node="3489cc5$p4$" resolve="text" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$tfO" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                              <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                               <node concept="37vLTw" id="3489cc5$p8i" role="37wK5m">
                                                 <ref role="3cqZAo" node="3489cc5$p54" resolve="iend" />
                                               </node>
@@ -40986,13 +40986,13 @@
                                       </node>
                                       <node concept="2YIFZM" id="3489cc5$tfQ" role="3uHU7w">
                                         <ref role="1Pybhc" to="wyt6:~Character" resolve="Character" />
-                                        <ref role="37wK5l" to="wyt6:~Character.isLetterOrDigit(char):boolean" resolve="isLetterOrDigit" />
+                                        <ref role="37wK5l" to="wyt6:~Character.isLetterOrDigit(char)" resolve="isLetterOrDigit" />
                                         <node concept="2OqwBi" id="3489cc5$tfT" role="37wK5m">
                                           <node concept="37vLTw" id="3489cc5$tfS" role="2Oq$k0">
                                             <ref role="3cqZAo" node="3489cc5$p4$" resolve="text" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$tfU" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                            <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                             <node concept="3cpWsd" id="3489cc5$p7m" role="37wK5m">
                                               <node concept="37vLTw" id="3489cc5$p7n" role="3uHU7B">
                                                 <ref role="3cqZAo" node="3489cc5$p54" resolve="iend" />
@@ -41095,7 +41095,7 @@
                           <ref role="3cqZAo" node="3489cc5$p4$" resolve="text" />
                         </node>
                         <node concept="liA8E" id="3489cc5$tfY" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                          <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                         </node>
                       </node>
                     </node>
@@ -41187,7 +41187,7 @@
                 </node>
                 <node concept="2YIFZM" id="3489cc5$tg0" role="37vLTx">
                   <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                  <ref role="37wK5l" to="wyt6:~String.valueOf(char):java.lang.String" resolve="valueOf" />
+                  <ref role="37wK5l" to="wyt6:~String.valueOf(char)" resolve="valueOf" />
                   <node concept="10QFUN" id="3489cc5$p5$" role="37wK5m">
                     <node concept="37vLTw" id="3489cc5$p5_" role="10QFUP">
                       <ref role="3cqZAo" node="3489cc5$p4r" resolve="keychar" />
@@ -41330,13 +41330,13 @@
             </node>
             <node concept="2YIFZM" id="3489cc5$tg2" role="37vLTx">
               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
               <node concept="3cmrfG" id="3489cc5$pd9" role="37wK5m">
                 <property role="3cmrfH" value="0" />
               </node>
               <node concept="2YIFZM" id="3489cc5$tg4" role="37wK5m">
                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                 <node concept="37vLTw" id="3489cc5$pdb" role="37wK5m">
                   <ref role="3cqZAo" node="3489cc5$pcD" resolve="movestart" />
                 </node>
@@ -41345,7 +41345,7 @@
                     <ref role="3cqZAo" node="3489cc5$pc_" resolve="text" />
                   </node>
                   <node concept="liA8E" id="3489cc5$tg8" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                    <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                   </node>
                 </node>
               </node>
@@ -41359,13 +41359,13 @@
             </node>
             <node concept="2YIFZM" id="3489cc5$tga" role="37vLTx">
               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
               <node concept="3cmrfG" id="3489cc5$pdh" role="37wK5m">
                 <property role="3cmrfH" value="0" />
               </node>
               <node concept="2YIFZM" id="3489cc5$tgc" role="37wK5m">
                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                 <node concept="37vLTw" id="3489cc5$pdj" role="37wK5m">
                   <ref role="3cqZAo" node="3489cc5$pcF" resolve="moveend" />
                 </node>
@@ -41374,7 +41374,7 @@
                     <ref role="3cqZAo" node="3489cc5$pc_" resolve="text" />
                   </node>
                   <node concept="liA8E" id="3489cc5$tgg" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                    <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                   </node>
                 </node>
               </node>
@@ -41396,7 +41396,7 @@
                 <node concept="10Oyi0" id="3489cc5$pdt" role="1tU5fm" />
                 <node concept="2YIFZM" id="3489cc5$tgi" role="33vP2m">
                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                  <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                  <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                   <node concept="37vLTw" id="3489cc5$pdv" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$pcD" resolve="movestart" />
                   </node>
@@ -41422,7 +41422,7 @@
                         <ref role="3cqZAo" node="3489cc5$pc_" resolve="text" />
                       </node>
                       <node concept="liA8E" id="3489cc5$tgm" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.substring(int,int):java.lang.String" resolve="substring" />
+                        <ref role="37wK5l" to="wyt6:~String.substring(int,int)" resolve="substring" />
                         <node concept="3cmrfG" id="3489cc5$pdC" role="37wK5m">
                           <property role="3cmrfH" value="0" />
                         </node>
@@ -41440,10 +41440,10 @@
                       <ref role="3cqZAo" node="3489cc5$pc_" resolve="text" />
                     </node>
                     <node concept="liA8E" id="3489cc5$tgq" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.substring(int):java.lang.String" resolve="substring" />
+                      <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
                       <node concept="2YIFZM" id="3489cc5$tgs" role="37wK5m">
                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                        <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                        <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                         <node concept="37vLTw" id="3489cc5$pdH" role="37wK5m">
                           <ref role="3cqZAo" node="3489cc5$pcD" resolve="movestart" />
                         </node>
@@ -41474,7 +41474,7 @@
                         <ref role="3cqZAo" node="3489cc5$pcB" resolve="insert" />
                       </node>
                       <node concept="liA8E" id="3489cc5$tgw" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                        <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                       </node>
                     </node>
                   </node>
@@ -44080,7 +44080,7 @@
                                                       </node>
                                                       <node concept="2YIFZM" id="3489cc5$tim" role="3uHU7w">
                                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                                         <node concept="3cmrfG" id="3489cc5$pNf" role="37wK5m">
                                                           <property role="3cmrfH" value="0" />
                                                         </node>
@@ -44100,7 +44100,7 @@
                                                       </node>
                                                       <node concept="2YIFZM" id="3489cc5$tis" role="3uHU7w">
                                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                                         <node concept="3cmrfG" id="3489cc5$pNk" role="37wK5m">
                                                           <property role="3cmrfH" value="0" />
                                                         </node>
@@ -44120,7 +44120,7 @@
                                                       </node>
                                                       <node concept="2YIFZM" id="3489cc5$tiy" role="3uHU7w">
                                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                        <ref role="37wK5l" to="wyt6:~Math.abs(int):int" resolve="abs" />
+                                                        <ref role="37wK5l" to="wyt6:~Math.abs(int)" resolve="abs" />
                                                         <node concept="37vLTw" id="3489cc5$pNp" role="37wK5m">
                                                           <ref role="3cqZAo" node="3489cc5$pMX" resolve="dx" />
                                                         </node>
@@ -44137,7 +44137,7 @@
                                                       </node>
                                                       <node concept="2YIFZM" id="3489cc5$tiC" role="3uHU7w">
                                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                        <ref role="37wK5l" to="wyt6:~Math.abs(int):int" resolve="abs" />
+                                                        <ref role="37wK5l" to="wyt6:~Math.abs(int)" resolve="abs" />
                                                         <node concept="37vLTw" id="3489cc5$pNt" role="37wK5m">
                                                           <ref role="3cqZAo" node="3489cc5$pN3" resolve="dy" />
                                                         </node>
@@ -45727,10 +45727,10 @@
                                       <node concept="3clFbS" id="3489cc5$pDg" role="3clFbx">
                                         <node concept="3clFbF" id="3489cc5$pDh" role="3cqZAp">
                                           <node concept="1rXfSq" id="3489cc5$pDi" role="3clFbG">
-                                            <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor):void" resolve="setCursor" />
+                                            <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor)" resolve="setCursor" />
                                             <node concept="2YIFZM" id="3489cc5$tjW" role="37wK5m">
                                               <ref role="1Pybhc" to="z60i:~Cursor" resolve="Cursor" />
-                                              <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int):java.awt.Cursor" resolve="getPredefinedCursor" />
+                                              <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int)" resolve="getPredefinedCursor" />
                                               <node concept="10M0yZ" id="3489cc5$SZM" role="37wK5m">
                                                 <ref role="1PxDUh" to="z60i:~Cursor" resolve="Cursor" />
                                                 <ref role="3cqZAo" to="z60i:~Cursor.DEFAULT_CURSOR" resolve="DEFAULT_CURSOR" />
@@ -45766,10 +45766,10 @@
                                       </node>
                                       <node concept="3clFbF" id="3489cc5$pCM" role="3cqZAp">
                                         <node concept="1rXfSq" id="3489cc5$pCN" role="3clFbG">
-                                          <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor):void" resolve="setCursor" />
+                                          <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor)" resolve="setCursor" />
                                           <node concept="2YIFZM" id="3489cc5$tk0" role="37wK5m">
                                             <ref role="1Pybhc" to="z60i:~Cursor" resolve="Cursor" />
-                                            <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int):java.awt.Cursor" resolve="getPredefinedCursor" />
+                                            <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int)" resolve="getPredefinedCursor" />
                                             <node concept="3K4zz7" id="3489cc5$pCS" role="37wK5m">
                                               <node concept="37vLTw" id="3489cc5$pCP" role="3K4Cdx">
                                                 <ref role="3cqZAo" node="3489cc5$pCD" resolve="horizontal" />
@@ -45890,20 +45890,20 @@
                                         </node>
                                         <node concept="2YIFZM" id="3489cc5$tk6" role="37vLTx">
                                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                          <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                           <node concept="3cmrfG" id="3489cc5$pC3" role="37wK5m">
                                             <property role="3cmrfH" value="0" />
                                           </node>
                                           <node concept="2YIFZM" id="3489cc5$tk8" role="37wK5m">
                                             <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                            <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                            <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                             <node concept="37vLTw" id="3489cc5$pC5" role="37wK5m">
                                               <ref role="3cqZAo" node="3489cc5$pBG" resolve="moveto" />
                                             </node>
                                             <node concept="3cpWsd" id="3489cc5$pC6" role="37wK5m">
                                               <node concept="2YIFZM" id="3489cc5$tka" role="3uHU7B">
                                                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                                <ref role="37wK5l" to="wyt6:~Math.abs(int):int" resolve="abs" />
+                                                <ref role="37wK5l" to="wyt6:~Math.abs(int)" resolve="abs" />
                                                 <node concept="3K4zz7" id="3489cc5$pCb" role="37wK5m">
                                                   <node concept="37vLTw" id="3489cc5$pC8" role="3K4Cdx">
                                                     <ref role="3cqZAo" node="3489cc5$pBz" resolve="horizontal" />
@@ -46264,13 +46264,13 @@
                                     </node>
                                     <node concept="2YIFZM" id="3489cc5$tky" role="37vLTx">
                                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                       <node concept="37vLTw" id="3489cc5$pAx" role="37wK5m">
                                         <ref role="3cqZAo" node="3489cc5$p_r" resolve="minimum" />
                                       </node>
                                       <node concept="2YIFZM" id="3489cc5$tk$" role="37wK5m">
                                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                        <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                         <node concept="37vLTw" id="3489cc5$pAz" role="37wK5m">
                                           <ref role="3cqZAo" node="3489cc5$p_Z" resolve="newvalue" />
                                         </node>
@@ -46851,10 +46851,10 @@
                           <node concept="3clFbS" id="3489cc5$pxN" role="3clFbx">
                             <node concept="3clFbF" id="3489cc5$pxO" role="3cqZAp">
                               <node concept="1rXfSq" id="3489cc5$pxP" role="3clFbG">
-                                <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor):void" resolve="setCursor" />
+                                <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor)" resolve="setCursor" />
                                 <node concept="2YIFZM" id="3489cc5$tkY" role="37wK5m">
                                   <ref role="1Pybhc" to="z60i:~Cursor" resolve="Cursor" />
-                                  <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int):java.awt.Cursor" resolve="getPredefinedCursor" />
+                                  <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int)" resolve="getPredefinedCursor" />
                                   <node concept="10M0yZ" id="3489cc5$T04" role="37wK5m">
                                     <ref role="1PxDUh" to="z60i:~Cursor" resolve="Cursor" />
                                     <ref role="3cqZAo" to="z60i:~Cursor.DEFAULT_CURSOR" resolve="DEFAULT_CURSOR" />
@@ -46867,10 +46867,10 @@
                         <node concept="3clFbS" id="3489cc5$pxD" role="3clFbx">
                           <node concept="3clFbF" id="3489cc5$pxE" role="3cqZAp">
                             <node concept="1rXfSq" id="3489cc5$pxF" role="3clFbG">
-                              <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor):void" resolve="setCursor" />
+                              <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor)" resolve="setCursor" />
                               <node concept="2YIFZM" id="3489cc5$tl2" role="37wK5m">
                                 <ref role="1Pybhc" to="z60i:~Cursor" resolve="Cursor" />
-                                <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int):java.awt.Cursor" resolve="getPredefinedCursor" />
+                                <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int)" resolve="getPredefinedCursor" />
                                 <node concept="10M0yZ" id="3489cc5$T05" role="37wK5m">
                                   <ref role="1PxDUh" to="z60i:~Cursor" resolve="Cursor" />
                                   <ref role="3cqZAo" to="z60i:~Cursor.WAIT_CURSOR" resolve="WAIT_CURSOR" />
@@ -47525,7 +47525,7 @@
                             <ref role="3cqZAo" node="3489cc5$pt3" resolve="icon" />
                           </node>
                           <node concept="liA8E" id="3489cc5$tlo" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver):int" resolve="getWidth" />
+                            <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver)" resolve="getWidth" />
                             <node concept="Xjq3P" id="3489cc5$ptr" role="37wK5m" />
                           </node>
                         </node>
@@ -48578,10 +48578,10 @@
                 <node concept="3clFbS" id="3489cc5$pWA" role="3clFbx">
                   <node concept="3clFbF" id="3489cc5$pWB" role="3cqZAp">
                     <node concept="1rXfSq" id="3489cc5$pWC" role="3clFbG">
-                      <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor):void" resolve="setCursor" />
+                      <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor)" resolve="setCursor" />
                       <node concept="2YIFZM" id="3489cc5$tlS" role="37wK5m">
                         <ref role="1Pybhc" to="z60i:~Cursor" resolve="Cursor" />
-                        <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int):java.awt.Cursor" resolve="getPredefinedCursor" />
+                        <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int)" resolve="getPredefinedCursor" />
                         <node concept="10M0yZ" id="3489cc5$T0p" role="37wK5m">
                           <ref role="1PxDUh" to="z60i:~Cursor" resolve="Cursor" />
                           <ref role="3cqZAo" to="z60i:~Cursor.DEFAULT_CURSOR" resolve="DEFAULT_CURSOR" />
@@ -48594,10 +48594,10 @@
               <node concept="3clFbS" id="3489cc5$pW4" role="3clFbx">
                 <node concept="3clFbF" id="3489cc5$pW5" role="3cqZAp">
                   <node concept="1rXfSq" id="3489cc5$pW6" role="3clFbG">
-                    <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor):void" resolve="setCursor" />
+                    <ref role="37wK5l" to="z60i:~Component.setCursor(java.awt.Cursor)" resolve="setCursor" />
                     <node concept="2YIFZM" id="3489cc5$tlW" role="37wK5m">
                       <ref role="1Pybhc" to="z60i:~Cursor" resolve="Cursor" />
-                      <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int):java.awt.Cursor" resolve="getPredefinedCursor" />
+                      <ref role="37wK5l" to="z60i:~Cursor.getPredefinedCursor(int)" resolve="getPredefinedCursor" />
                       <node concept="10M0yZ" id="3489cc5$T0q" role="37wK5m">
                         <ref role="1PxDUh" to="z60i:~Cursor" resolve="Cursor" />
                         <ref role="3cqZAo" to="z60i:~Cursor.TEXT_CURSOR" resolve="TEXT_CURSOR" />
@@ -49047,13 +49047,13 @@
                         </node>
                         <node concept="2YIFZM" id="3489cc5$tmg" role="3K4E3e">
                           <ref role="1Pybhc" to="wyt6:~Character" resolve="Character" />
-                          <ref role="37wK5l" to="wyt6:~Character.isLetterOrDigit(char):boolean" resolve="isLetterOrDigit" />
+                          <ref role="37wK5l" to="wyt6:~Character.isLetterOrDigit(char)" resolve="isLetterOrDigit" />
                           <node concept="2OqwBi" id="3489cc5$tmj" role="37wK5m">
                             <node concept="37vLTw" id="3489cc5$tmi" role="2Oq$k0">
                               <ref role="3cqZAo" node="3489cc5$pTs" resolve="text" />
                             </node>
                             <node concept="liA8E" id="3489cc5$tmk" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                              <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                               <node concept="3cpWsd" id="3489cc5$pTI" role="37wK5m">
                                 <node concept="37vLTw" id="3489cc5$pTJ" role="3uHU7B">
                                   <ref role="3cqZAo" node="3489cc5$pTa" resolve="caretstart" />
@@ -49072,7 +49072,7 @@
                                 <ref role="3cqZAo" node="3489cc5$pTs" resolve="text" />
                               </node>
                               <node concept="liA8E" id="3489cc5$tmo" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                 <node concept="3cpWsd" id="3489cc5$pTN" role="37wK5m">
                                   <node concept="37vLTw" id="3489cc5$pTO" role="3uHU7B">
                                     <ref role="3cqZAo" node="3489cc5$pTa" resolve="caretstart" />
@@ -49113,7 +49113,7 @@
                             <ref role="3cqZAo" node="3489cc5$pTs" resolve="text" />
                           </node>
                           <node concept="liA8E" id="3489cc5$tms" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                            <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                           </node>
                         </node>
                       </node>
@@ -49132,13 +49132,13 @@
                         </node>
                         <node concept="2YIFZM" id="3489cc5$tmu" role="3K4E3e">
                           <ref role="1Pybhc" to="wyt6:~Character" resolve="Character" />
-                          <ref role="37wK5l" to="wyt6:~Character.isLetterOrDigit(char):boolean" resolve="isLetterOrDigit" />
+                          <ref role="37wK5l" to="wyt6:~Character.isLetterOrDigit(char)" resolve="isLetterOrDigit" />
                           <node concept="2OqwBi" id="3489cc5$tmx" role="37wK5m">
                             <node concept="37vLTw" id="3489cc5$tmw" role="2Oq$k0">
                               <ref role="3cqZAo" node="3489cc5$pTs" resolve="text" />
                             </node>
                             <node concept="liA8E" id="3489cc5$tmy" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                              <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                               <node concept="37vLTw" id="3489cc5$pUb" role="37wK5m">
                                 <ref role="3cqZAo" node="3489cc5$pTi" resolve="caretend" />
                               </node>
@@ -49152,7 +49152,7 @@
                                 <ref role="3cqZAo" node="3489cc5$pTs" resolve="text" />
                               </node>
                               <node concept="liA8E" id="3489cc5$tmA" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                 <node concept="37vLTw" id="3489cc5$pUe" role="37wK5m">
                                   <ref role="3cqZAo" node="3489cc5$pTi" resolve="caretend" />
                                 </node>
@@ -49312,9 +49312,9 @@
               <ref role="3uigEE" to="z60i:~FontMetrics" resolve="FontMetrics" />
             </node>
             <node concept="1rXfSq" id="3489cc5$pX2" role="33vP2m">
-              <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font):java.awt.FontMetrics" resolve="getFontMetrics" />
+              <ref role="37wK5l" to="z60i:~Component.getFontMetrics(java.awt.Font)" resolve="getFontMetrics" />
               <node concept="1rXfSq" id="3489cc5$pX3" role="37wK5m">
-                <ref role="37wK5l" to="z60i:~Component.getFont():java.awt.Font" resolve="getFont" />
+                <ref role="37wK5l" to="z60i:~Component.getFont()" resolve="getFont" />
               </node>
             </node>
           </node>
@@ -49362,7 +49362,7 @@
                     <ref role="3cqZAo" node="3489cc5$pWS" resolve="text" />
                   </node>
                   <node concept="liA8E" id="3489cc5$tmE" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.indexOf(int,int):int" resolve="indexOf" />
+                    <ref role="37wK5l" to="wyt6:~String.indexOf(int,int)" resolve="indexOf" />
                     <node concept="1Xhbcc" id="3489cc5$pXr" role="37wK5m">
                       <property role="1XhdNS" value="\n" />
                     </node>
@@ -49396,7 +49396,7 @@
                       <ref role="3cqZAo" node="3489cc5$pWZ" resolve="fm" />
                     </node>
                     <node concept="liA8E" id="3489cc5$tmI" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~FontMetrics.getHeight():int" resolve="getHeight" />
+                      <ref role="37wK5l" to="z60i:~FontMetrics.getHeight()" resolve="getHeight" />
                     </node>
                   </node>
                 </node>
@@ -49424,7 +49424,7 @@
                             <ref role="3cqZAo" node="3489cc5$pWS" resolve="text" />
                           </node>
                           <node concept="liA8E" id="3489cc5$tmM" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                            <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                           </node>
                         </node>
                       </node>
@@ -49464,7 +49464,7 @@
                             <ref role="3cqZAo" node="3489cc5$pWZ" resolve="fm" />
                           </node>
                           <node concept="liA8E" id="3489cc5$tmQ" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char):int" resolve="charWidth" />
+                            <ref role="37wK5l" to="z60i:~FontMetrics.charWidth(char)" resolve="charWidth" />
                             <node concept="3K4zz7" id="3489cc5$pY9" role="37wK5m">
                               <node concept="37vLTw" id="3489cc5$pY5" role="3K4Cdx">
                                 <ref role="3cqZAo" node="3489cc5$pWP" resolve="hidden" />
@@ -49477,7 +49477,7 @@
                                   <ref role="3cqZAo" node="3489cc5$pWS" resolve="text" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$tmU" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                  <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                   <node concept="37vLTw" id="3489cc5$pY8" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$pXP" resolve="k" />
                                   </node>
@@ -49541,7 +49541,7 @@
                     <ref role="3cqZAo" node="3489cc5$pWZ" resolve="fm" />
                   </node>
                   <node concept="liA8E" id="3489cc5$tmY" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~FontMetrics.getHeight():int" resolve="getHeight" />
+                    <ref role="37wK5l" to="z60i:~FontMetrics.getHeight()" resolve="getHeight" />
                   </node>
                 </node>
               </node>
@@ -49936,13 +49936,13 @@
                                 </node>
                                 <node concept="2YIFZM" id="3489cc5$tnm" role="37vLTx">
                                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                  <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                  <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                   <node concept="3cmrfG" id="3489cc5$q36" role="37wK5m">
                                     <property role="3cmrfH" value="0" />
                                   </node>
                                   <node concept="2YIFZM" id="3489cc5$tno" role="37wK5m">
                                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                    <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                    <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                     <node concept="37vLTw" id="3489cc5$q38" role="37wK5m">
                                       <ref role="3cqZAo" node="3489cc5$q2M" resolve="viewy" />
                                     </node>
@@ -50076,13 +50076,13 @@
                               </node>
                               <node concept="2YIFZM" id="3489cc5$tnM" role="37vLTx">
                                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                                <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                                 <node concept="3cmrfG" id="3489cc5$q2p" role="37wK5m">
                                   <property role="3cmrfH" value="0" />
                                 </node>
                                 <node concept="2YIFZM" id="3489cc5$tnO" role="37wK5m">
                                   <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                                  <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                                  <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                                   <node concept="37vLTw" id="3489cc5$q2r" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$q25" resolve="viewx" />
                                   </node>
@@ -50877,7 +50877,7 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$toY" role="3K4E3e">
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                      <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                       <node concept="1ZRNhn" id="3489cc5$q6C" role="37wK5m">
                         <node concept="2OqwBi" id="3489cc5$tp1" role="2$L3a6">
                           <node concept="37vLTw" id="3489cc5$tp0" role="2Oq$k0">
@@ -50894,7 +50894,7 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$tp4" role="3K4GZi">
                       <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                      <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                      <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                       <node concept="37vLTw" id="3489cc5$q6G" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$q4B" resolve="dy" />
                       </node>
@@ -50956,7 +50956,7 @@
                   </node>
                   <node concept="2YIFZM" id="3489cc5$tpi" role="3K4E3e">
                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                    <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                    <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                     <node concept="1ZRNhn" id="3489cc5$q6d" role="37wK5m">
                       <node concept="2OqwBi" id="3489cc5$tpl" role="2$L3a6">
                         <node concept="37vLTw" id="3489cc5$tpk" role="2Oq$k0">
@@ -50973,7 +50973,7 @@
                   </node>
                   <node concept="2YIFZM" id="3489cc5$tpo" role="3K4GZi">
                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                    <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                    <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                     <node concept="37vLTw" id="3489cc5$q6h" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$q4z" resolve="dx" />
                     </node>
@@ -51371,11 +51371,11 @@
                     </node>
                     <node concept="2YIFZM" id="3489cc5$tqe" role="33vP2m">
                       <ref role="1Pybhc" to="wyt6:~String" resolve="String" />
-                      <ref role="37wK5l" to="wyt6:~String.valueOf(int):java.lang.String" resolve="valueOf" />
+                      <ref role="37wK5l" to="wyt6:~String.valueOf(int)" resolve="valueOf" />
                       <node concept="3cpWs3" id="3489cc5$q8M" role="37wK5m">
                         <node concept="2YIFZM" id="3489cc5$tqg" role="3uHU7B">
                           <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                          <ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String):int" resolve="parseInt" />
+                          <ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String)" resolve="parseInt" />
                           <node concept="37vLTw" id="3489cc5$q8O" role="37wK5m">
                             <ref role="3cqZAo" node="3489cc5$q8v" resolve="text" />
                           </node>
@@ -51435,7 +51435,7 @@
                         <ref role="3cqZAo" node="3489cc5$q8I" resolve="value" />
                       </node>
                       <node concept="liA8E" id="3489cc5$tqk" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                        <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                       </node>
                     </node>
                     <node concept="3cmrfG" id="3489cc5$q99" role="37wK5m">
@@ -51568,11 +51568,11 @@
                           <ref role="3cqZAo" node="3489cc5$qa1" resolve="ite" />
                         </node>
                         <node concept="liA8E" id="3489cc5$tqo" role="2OqNvi">
-                          <ref role="37wK5l" to="t6h5:~InvocationTargetException.getTargetException():java.lang.Throwable" resolve="getTargetException" />
+                          <ref role="37wK5l" to="t6h5:~InvocationTargetException.getTargetException()" resolve="getTargetException" />
                         </node>
                       </node>
                       <node concept="liA8E" id="3489cc5$qac" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace():void" resolve="printStackTrace" />
+                        <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace()" resolve="printStackTrace" />
                       </node>
                     </node>
                   </node>
@@ -51593,7 +51593,7 @@
                         <ref role="3cqZAo" node="3489cc5$qa4" resolve="exc" />
                       </node>
                       <node concept="liA8E" id="3489cc5$tqs" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace():void" resolve="printStackTrace" />
+                        <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace()" resolve="printStackTrace" />
                       </node>
                     </node>
                   </node>
@@ -51613,7 +51613,7 @@
                       <ref role="3cqZAo" node="3489cc5$q9H" resolve="method" />
                     </node>
                     <node concept="liA8E" id="3489cc5$tqw" role="2OqNvi">
-                      <ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...):java.lang.Object" resolve="invoke" />
+                      <ref role="37wK5l" to="t6h5:~Method.invoke(java.lang.Object,java.lang.Object...)" resolve="invoke" />
                       <node concept="Xjq3P" id="3489cc5$q9Z" role="37wK5m" />
                       <node concept="10Nm6u" id="3489cc5$qa0" role="37wK5m" />
                     </node>
@@ -51759,7 +51759,7 @@
                     <ref role="3cqZAo" node="3489cc5$qaX" resolve="bounds" />
                   </node>
                   <node concept="liA8E" id="3489cc5$tq$" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Rectangle.contains(int,int):boolean" resolve="contains" />
+                    <ref role="37wK5l" to="z60i:~Rectangle.contains(int,int)" resolve="contains" />
                     <node concept="37vLTw" id="3489cc5$qbb" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$qaq" resolve="x" />
                     </node>
@@ -52706,7 +52706,7 @@
                                 <ref role="3cqZAo" node="3489cc5$qem" resolve="r" />
                               </node>
                               <node concept="liA8E" id="3489cc5$trg" role="2OqNvi">
-                                <ref role="37wK5l" to="z60i:~Rectangle.contains(int,int):boolean" resolve="contains" />
+                                <ref role="37wK5l" to="z60i:~Rectangle.contains(int,int)" resolve="contains" />
                                 <node concept="37vLTw" id="3489cc5$qeu" role="37wK5m">
                                   <ref role="3cqZAo" node="3489cc5$qaq" resolve="x" />
                                 </node>
@@ -53031,7 +53031,7 @@
                                     <ref role="3cqZAo" node="3489cc5$qbR" resolve="icon" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$tr$" role="2OqNvi">
-                                    <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver):int" resolve="getWidth" />
+                                    <ref role="37wK5l" to="z60i:~Image.getWidth(java.awt.image.ImageObserver)" resolve="getWidth" />
                                     <node concept="Xjq3P" id="3489cc5$qcb" role="37wK5m" />
                                   </node>
                                 </node>
@@ -53375,7 +53375,7 @@
                   <node concept="10Oyi0" id="3489cc5$qkB" role="1tU5fm" />
                   <node concept="2YIFZM" id="3489cc5$tsA" role="33vP2m">
                     <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                    <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                    <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                     <node concept="37vLTw" id="3489cc5$qkD" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$lvy" resolve="block" />
                     </node>
@@ -53518,13 +53518,13 @@
                           <node concept="10Oyi0" id="3489cc5$qlE" role="1tU5fm" />
                           <node concept="2YIFZM" id="3489cc5$tsS" role="33vP2m">
                             <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                            <ref role="37wK5l" to="wyt6:~Math.min(int,int):int" resolve="min" />
+                            <ref role="37wK5l" to="wyt6:~Math.min(int,int)" resolve="min" />
                             <node concept="37vLTw" id="3489cc5$qlG" role="37wK5m">
                               <ref role="3cqZAo" node="3489cc5$qlv" resolve="track" />
                             </node>
                             <node concept="2YIFZM" id="3489cc5$tsU" role="37wK5m">
                               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                              <ref role="37wK5l" to="wyt6:~Math.max(int,int):int" resolve="max" />
+                              <ref role="37wK5l" to="wyt6:~Math.max(int,int)" resolve="max" />
                               <node concept="FJ1c_" id="3489cc5$qlI" role="37wK5m">
                                 <node concept="17qRlL" id="3489cc5$qlJ" role="3uHU7B">
                                   <node concept="37vLTw" id="3489cc5$qlK" role="3uHU7B">
@@ -54902,7 +54902,7 @@
               </node>
               <node concept="2YIFZM" id="3489cc5$twO" role="3uHU7w">
                 <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                <ref role="37wK5l" to="wyt6:~Math.abs(int):int" resolve="abs" />
+                <ref role="37wK5l" to="wyt6:~Math.abs(int)" resolve="abs" />
                 <node concept="2OqwBi" id="3489cc5$twR" role="37wK5m">
                   <node concept="37vLTw" id="3489cc5$twQ" role="2Oq$k0">
                     <ref role="3cqZAo" node="3489cc5$qrw" resolve="bounds" />
@@ -55119,7 +55119,7 @@
         </node>
         <node concept="3clFbF" id="3489cc5$qsJ" role="3cqZAp">
           <node concept="1rXfSq" id="3489cc5$qsK" role="3clFbG">
-            <ref role="37wK5l" to="z60i:~Component.repaint(int,int,int,int):void" resolve="repaint" />
+            <ref role="37wK5l" to="z60i:~Component.repaint(int,int,int,int)" resolve="repaint" />
             <node concept="37vLTw" id="3489cc5$qsL" role="37wK5m">
               <ref role="3cqZAo" node="3489cc5$qse" resolve="x" />
             </node>
@@ -55225,7 +55225,7 @@
             </node>
             <node concept="3clFbF" id="3489cc5$qtl" role="3cqZAp">
               <node concept="1rXfSq" id="3489cc5$qtm" role="3clFbG">
-                <ref role="37wK5l" to="z60i:~Component.requestFocus():void" resolve="requestFocus" />
+                <ref role="37wK5l" to="z60i:~Component.requestFocus()" resolve="requestFocus" />
               </node>
             </node>
             <node concept="3SKdUt" id="3489cc5$rJF" role="3cqZAp">
@@ -56639,7 +56639,7 @@
                   </node>
                 </node>
                 <node concept="liA8E" id="3489cc5$q_W" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                   <node concept="37vLTw" id="3489cc5$q_X" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$q_A" resolve="classname" />
                   </node>
@@ -57002,7 +57002,7 @@
                             <ref role="3cqZAo" node="3489cc5$qAQ" resolve="value" />
                           </node>
                           <node concept="liA8E" id="3489cc5$typ" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                            <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                             <node concept="37vLTw" id="3489cc5$qBM" role="37wK5m">
                               <ref role="3cqZAo" node="3489cc5$qBz" resolve="oldvalue" />
                             </node>
@@ -59403,7 +59403,7 @@
                     <ref role="3cqZAo" node="3489cc5$qP2" resolve="compname" />
                   </node>
                   <node concept="liA8E" id="3489cc5$tzz" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                     <node concept="37vLTw" id="3489cc5$qQi" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$qOU" resolve="classname" />
                     </node>
@@ -59445,7 +59445,7 @@
                     <property role="Xl_RC" value="column" />
                   </node>
                   <node concept="liA8E" id="3489cc5$qQY" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                     <node concept="37vLTw" id="3489cc5$qQZ" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$qOU" resolve="classname" />
                     </node>
@@ -59474,7 +59474,7 @@
                       <property role="Xl_RC" value="row" />
                     </node>
                     <node concept="liA8E" id="3489cc5$qRc" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                      <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                       <node concept="37vLTw" id="3489cc5$qRd" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$qOU" resolve="classname" />
                       </node>
@@ -59498,7 +59498,7 @@
                   <property role="Xl_RC" value="tab" />
                 </node>
                 <node concept="liA8E" id="3489cc5$qQx" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                   <node concept="37vLTw" id="3489cc5$qQy" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$qOU" resolve="classname" />
                   </node>
@@ -59527,7 +59527,7 @@
                     <property role="Xl_RC" value="component" />
                   </node>
                   <node concept="liA8E" id="3489cc5$qQJ" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                     <node concept="37vLTw" id="3489cc5$qQK" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$qOU" resolve="classname" />
                     </node>
@@ -59633,7 +59633,7 @@
               <ref role="3cqZAo" node="3489cc5$qRC" resolve="name" />
             </node>
             <node concept="liA8E" id="3489cc5$t$C" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+              <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
               <node concept="1rXfSq" id="3489cc5$qRH" role="37wK5m">
                 <ref role="37wK5l" node="3489cc5$qCx" resolve="get" />
                 <node concept="37vLTw" id="3489cc5$qRI" role="37wK5m">
@@ -60121,10 +60121,10 @@
                 </node>
                 <node concept="2OqwBi" id="3489cc5$qUQ" role="37vLTx">
                   <node concept="1rXfSq" id="3489cc5$qUR" role="2Oq$k0">
-                    <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                    <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                   </node>
                   <node concept="liA8E" id="3489cc5$qUS" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~Class.getResourceAsStream(java.lang.String):java.io.InputStream" resolve="getResourceAsStream" />
+                    <ref role="37wK5l" to="wyt6:~Class.getResourceAsStream(java.lang.String)" resolve="getResourceAsStream" />
                     <node concept="37vLTw" id="3489cc5$qUT" role="37wK5m">
                       <ref role="3cqZAo" node="3489cc5$qUD" resolve="path" />
                     </node>
@@ -60440,7 +60440,7 @@
                 <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
               </node>
               <node concept="liA8E" id="3489cc5$t$M" role="2OqNvi">
-                <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
               </node>
             </node>
           </node>
@@ -60473,7 +60473,7 @@
                           <property role="Xl_RC" value=" \t\n\r" />
                         </node>
                         <node concept="liA8E" id="3489cc5$r7r" role="2OqNvi">
-                          <ref role="37wK5l" to="wyt6:~String.indexOf(int):int" resolve="indexOf" />
+                          <ref role="37wK5l" to="wyt6:~String.indexOf(int)" resolve="indexOf" />
                           <node concept="37vLTw" id="3489cc5$r7s" role="37wK5m">
                             <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
                           </node>
@@ -60493,7 +60493,7 @@
                               <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                             </node>
                             <node concept="liA8E" id="3489cc5$t$Q" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                              <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                               <node concept="10QFUN" id="3489cc5$r7R" role="37wK5m">
                                 <node concept="37vLTw" id="3489cc5$r7S" role="10QFUP">
                                   <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
@@ -60515,7 +60515,7 @@
                                   <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$t$U" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~StringBuffer.length():int" resolve="length" />
+                                  <ref role="37wK5l" to="wyt6:~StringBuffer.length()" resolve="length" />
                                 </node>
                               </node>
                               <node concept="3cmrfG" id="3489cc5$r7_" role="3uHU7w">
@@ -60530,14 +60530,14 @@
                                   <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$t$Y" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~StringBuffer.charAt(int):char" resolve="charAt" />
+                                  <ref role="37wK5l" to="wyt6:~StringBuffer.charAt(int)" resolve="charAt" />
                                   <node concept="3cpWsd" id="3489cc5$r7D" role="37wK5m">
                                     <node concept="2OqwBi" id="3489cc5$t_1" role="3uHU7B">
                                       <node concept="37vLTw" id="3489cc5$t_0" role="2Oq$k0">
                                         <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                       </node>
                                       <node concept="liA8E" id="3489cc5$t_2" role="2OqNvi">
-                                        <ref role="37wK5l" to="wyt6:~StringBuffer.length():int" resolve="length" />
+                                        <ref role="37wK5l" to="wyt6:~StringBuffer.length()" resolve="length" />
                                       </node>
                                     </node>
                                     <node concept="3cmrfG" id="3489cc5$r7F" role="3uHU7w">
@@ -60559,7 +60559,7 @@
                                 <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                               </node>
                               <node concept="liA8E" id="3489cc5$t_6" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                 <node concept="1Xhbcc" id="3489cc5$r7M" role="37wK5m">
                                   <property role="1XhdNS" value=" " />
                                 </node>
@@ -60580,7 +60580,7 @@
                           <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                         </node>
                         <node concept="liA8E" id="3489cc5$t_a" role="2OqNvi">
-                          <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                          <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                         </node>
                       </node>
                     </node>
@@ -60600,7 +60600,7 @@
                             <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                           </node>
                           <node concept="liA8E" id="3489cc5$t_e" role="2OqNvi">
-                            <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                            <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                           </node>
                         </node>
                       </node>
@@ -60660,7 +60660,7 @@
                                       <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                     </node>
                                     <node concept="liA8E" id="3489cc5$t_i" role="2OqNvi">
-                                      <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                      <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                     </node>
                                   </node>
                                 </node>
@@ -60696,7 +60696,7 @@
                                   <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$t_m" role="2OqNvi">
-                                  <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                  <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                 </node>
                               </node>
                             </node>
@@ -60709,7 +60709,7 @@
                             <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                           </node>
                           <node concept="liA8E" id="3489cc5$t_q" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int):void" resolve="setLength" />
+                            <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int)" resolve="setLength" />
                             <node concept="3cmrfG" id="3489cc5$qZ9" role="37wK5m">
                               <property role="3cmrfH" value="0" />
                             </node>
@@ -60733,7 +60733,7 @@
                               <property role="Xl_RC" value="&gt;/ \t\n\r" />
                             </node>
                             <node concept="liA8E" id="3489cc5$qZh" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~String.indexOf(int):int" resolve="indexOf" />
+                              <ref role="37wK5l" to="wyt6:~String.indexOf(int)" resolve="indexOf" />
                               <node concept="37vLTw" id="3489cc5$qZi" role="37wK5m">
                                 <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
                               </node>
@@ -60752,7 +60752,7 @@
                                 <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                               </node>
                               <node concept="liA8E" id="3489cc5$t_u" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                 <node concept="10QFUN" id="3489cc5$qZp" role="37wK5m">
                                   <node concept="37vLTw" id="3489cc5$qZq" role="10QFUP">
                                     <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
@@ -60773,7 +60773,7 @@
                                           <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$t_y" role="2OqNvi">
-                                          <ref role="37wK5l" to="wyt6:~StringBuffer.length():int" resolve="length" />
+                                          <ref role="37wK5l" to="wyt6:~StringBuffer.length()" resolve="length" />
                                         </node>
                                       </node>
                                       <node concept="3cmrfG" id="3489cc5$qZy" role="3uHU7w">
@@ -60788,7 +60788,7 @@
                                           <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$t_A" role="2OqNvi">
-                                          <ref role="37wK5l" to="wyt6:~StringBuffer.charAt(int):char" resolve="charAt" />
+                                          <ref role="37wK5l" to="wyt6:~StringBuffer.charAt(int)" resolve="charAt" />
                                           <node concept="3cmrfG" id="3489cc5$qZA" role="37wK5m">
                                             <property role="3cmrfH" value="0" />
                                           </node>
@@ -60807,7 +60807,7 @@
                                         <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                       </node>
                                       <node concept="liA8E" id="3489cc5$t_E" role="2OqNvi">
-                                        <ref role="37wK5l" to="wyt6:~StringBuffer.charAt(int):char" resolve="charAt" />
+                                        <ref role="37wK5l" to="wyt6:~StringBuffer.charAt(int)" resolve="charAt" />
                                         <node concept="3cmrfG" id="3489cc5$qZF" role="37wK5m">
                                           <property role="3cmrfH" value="1" />
                                         </node>
@@ -60826,7 +60826,7 @@
                                       <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                     </node>
                                     <node concept="liA8E" id="3489cc5$t_I" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~StringBuffer.charAt(int):char" resolve="charAt" />
+                                      <ref role="37wK5l" to="wyt6:~StringBuffer.charAt(int)" resolve="charAt" />
                                       <node concept="3cmrfG" id="3489cc5$qZK" role="37wK5m">
                                         <property role="3cmrfH" value="2" />
                                       </node>
@@ -60864,7 +60864,7 @@
                                           <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$t_M" role="2OqNvi">
-                                          <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                          <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                         </node>
                                       </node>
                                     </node>
@@ -60953,7 +60953,7 @@
                                   <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$t_Q" role="2OqNvi">
-                                  <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                  <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                 </node>
                               </node>
                             </node>
@@ -60987,7 +60987,7 @@
                                   <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$t_U" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~StringBuffer.toString():java.lang.String" resolve="toString" />
+                                  <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
                                 </node>
                               </node>
                             </node>
@@ -61076,7 +61076,7 @@
                             <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                           </node>
                           <node concept="liA8E" id="3489cc5$t_Y" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int):void" resolve="setLength" />
+                            <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int)" resolve="setLength" />
                             <node concept="3cmrfG" id="3489cc5$r1m" role="37wK5m">
                               <property role="3cmrfH" value="0" />
                             </node>
@@ -61105,7 +61105,7 @@
                                   <property role="Xl_RC" value=" \t\n\r" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$r1x" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~String.indexOf(int):int" resolve="indexOf" />
+                                  <ref role="37wK5l" to="wyt6:~String.indexOf(int)" resolve="indexOf" />
                                   <node concept="37vLTw" id="3489cc5$r1y" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
                                   </node>
@@ -61128,7 +61128,7 @@
                                       <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                     </node>
                                     <node concept="liA8E" id="3489cc5$tA2" role="2OqNvi">
-                                      <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                      <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                     </node>
                                   </node>
                                 </node>
@@ -61198,7 +61198,7 @@
                                             <property role="Xl_RC" value="= \t\n\r" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$r3Q" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~String.indexOf(int):int" resolve="indexOf" />
+                                            <ref role="37wK5l" to="wyt6:~String.indexOf(int)" resolve="indexOf" />
                                             <node concept="37vLTw" id="3489cc5$r3R" role="37wK5m">
                                               <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
                                             </node>
@@ -61217,7 +61217,7 @@
                                               <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$tA8" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                              <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                               <node concept="10QFUN" id="3489cc5$r3Y" role="37wK5m">
                                                 <node concept="37vLTw" id="3489cc5$r3Z" role="10QFUP">
                                                   <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
@@ -61237,7 +61237,7 @@
                                                 <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$tAc" role="2OqNvi">
-                                                <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                                <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                               </node>
                                             </node>
                                           </node>
@@ -61256,7 +61256,7 @@
                                             <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$tAg" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~StringBuffer.toString():java.lang.String" resolve="toString" />
+                                            <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
                                           </node>
                                         </node>
                                       </node>
@@ -61267,7 +61267,7 @@
                                           <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$tAk" role="2OqNvi">
-                                          <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int):void" resolve="setLength" />
+                                          <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int)" resolve="setLength" />
                                           <node concept="3cmrfG" id="3489cc5$r4c" role="37wK5m">
                                             <property role="3cmrfH" value="0" />
                                           </node>
@@ -61281,7 +61281,7 @@
                                             <property role="Xl_RC" value=" \t\n\r" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$r4g" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~String.indexOf(int):int" resolve="indexOf" />
+                                            <ref role="37wK5l" to="wyt6:~String.indexOf(int)" resolve="indexOf" />
                                             <node concept="37vLTw" id="3489cc5$r4h" role="37wK5m">
                                               <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
                                             </node>
@@ -61304,7 +61304,7 @@
                                                 <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$tAo" role="2OqNvi">
-                                                <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                                <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                               </node>
                                             </node>
                                           </node>
@@ -61337,7 +61337,7 @@
                                             <property role="Xl_RC" value=" \t\n\r" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$r4$" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~String.indexOf(int):int" resolve="indexOf" />
+                                            <ref role="37wK5l" to="wyt6:~String.indexOf(int)" resolve="indexOf" />
                                             <node concept="37vLTI" id="3489cc5$r4_" role="37wK5m">
                                               <node concept="37vLTw" id="3489cc5$r4A" role="37vLTJ">
                                                 <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
@@ -61347,7 +61347,7 @@
                                                   <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                                 </node>
                                                 <node concept="liA8E" id="3489cc5$tAu" role="2OqNvi">
-                                                  <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                                  <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                                 </node>
                                               </node>
                                             </node>
@@ -61424,7 +61424,7 @@
                                                 <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$tA$" role="2OqNvi">
-                                                <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                                <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                               </node>
                                             </node>
                                           </node>
@@ -61446,7 +61446,7 @@
                                                 <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                               </node>
                                               <node concept="liA8E" id="3489cc5$tAC" role="2OqNvi">
-                                                <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                                <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                                 <node concept="10QFUN" id="3489cc5$r6D" role="37wK5m">
                                                   <node concept="37vLTw" id="3489cc5$r6E" role="10QFUP">
                                                     <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
@@ -61486,7 +61486,7 @@
                                                         <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                                       </node>
                                                       <node concept="liA8E" id="3489cc5$tAI" role="2OqNvi">
-                                                        <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                                        <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                                       </node>
                                                     </node>
                                                   </node>
@@ -61499,7 +61499,7 @@
                                                       <ref role="3cqZAo" node="3489cc5$r5e" resolve="eb" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$tAM" role="2OqNvi">
-                                                      <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                                      <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                                       <node concept="10QFUN" id="3489cc5$r5s" role="37wK5m">
                                                         <node concept="37vLTw" id="3489cc5$r5t" role="10QFUP">
                                                           <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
@@ -61523,7 +61523,7 @@
                                                     <ref role="3cqZAo" node="3489cc5$r5e" resolve="eb" />
                                                   </node>
                                                   <node concept="liA8E" id="3489cc5$tAQ" role="2OqNvi">
-                                                    <ref role="37wK5l" to="wyt6:~StringBuffer.toString():java.lang.String" resolve="toString" />
+                                                    <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -61534,7 +61534,7 @@
                                                   <property role="Xl_RC" value="lt" />
                                                 </node>
                                                 <node concept="liA8E" id="3489cc5$r5B" role="2OqNvi">
-                                                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                                                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                                   <node concept="37vLTw" id="3489cc5$r5C" role="37wK5m">
                                                     <ref role="3cqZAo" node="3489cc5$r5w" resolve="entity" />
                                                   </node>
@@ -61546,7 +61546,7 @@
                                                     <property role="Xl_RC" value="gt" />
                                                   </node>
                                                   <node concept="liA8E" id="3489cc5$r5L" role="2OqNvi">
-                                                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                                                    <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                                     <node concept="37vLTw" id="3489cc5$r5M" role="37wK5m">
                                                       <ref role="3cqZAo" node="3489cc5$r5w" resolve="entity" />
                                                     </node>
@@ -61558,7 +61558,7 @@
                                                       <property role="Xl_RC" value="amp" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$r5V" role="2OqNvi">
-                                                      <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                                                      <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                                       <node concept="37vLTw" id="3489cc5$r5W" role="37wK5m">
                                                         <ref role="3cqZAo" node="3489cc5$r5w" resolve="entity" />
                                                       </node>
@@ -61570,7 +61570,7 @@
                                                         <property role="Xl_RC" value="quot" />
                                                       </node>
                                                       <node concept="liA8E" id="3489cc5$r65" role="2OqNvi">
-                                                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                                                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                                         <node concept="37vLTw" id="3489cc5$r66" role="37wK5m">
                                                           <ref role="3cqZAo" node="3489cc5$r5w" resolve="entity" />
                                                         </node>
@@ -61582,7 +61582,7 @@
                                                           <property role="Xl_RC" value="apos" />
                                                         </node>
                                                         <node concept="liA8E" id="3489cc5$r6f" role="2OqNvi">
-                                                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                                                          <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                                                           <node concept="37vLTw" id="3489cc5$r6g" role="37wK5m">
                                                             <ref role="3cqZAo" node="3489cc5$r5w" resolve="entity" />
                                                           </node>
@@ -61594,7 +61594,7 @@
                                                             <ref role="3cqZAo" node="3489cc5$r5w" resolve="entity" />
                                                           </node>
                                                           <node concept="liA8E" id="3489cc5$tAU" role="2OqNvi">
-                                                            <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String):boolean" resolve="startsWith" />
+                                                            <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
                                                             <node concept="Xl_RD" id="3489cc5$r6o" role="37wK5m">
                                                               <property role="Xl_RC" value="#" />
                                                             </node>
@@ -61622,17 +61622,17 @@
                                                                 <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                                               </node>
                                                               <node concept="liA8E" id="3489cc5$tC0" role="2OqNvi">
-                                                                <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                                                <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                                                 <node concept="10QFUN" id="3489cc5$r6t" role="37wK5m">
                                                                   <node concept="2YIFZM" id="3489cc5$tC2" role="10QFUP">
                                                                     <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                                                                    <ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String):int" resolve="parseInt" />
+                                                                    <ref role="37wK5l" to="wyt6:~Integer.parseInt(java.lang.String)" resolve="parseInt" />
                                                                     <node concept="2OqwBi" id="3489cc5$tC5" role="37wK5m">
                                                                       <node concept="37vLTw" id="3489cc5$tC4" role="2Oq$k0">
                                                                         <ref role="3cqZAo" node="3489cc5$r5w" resolve="entity" />
                                                                       </node>
                                                                       <node concept="liA8E" id="3489cc5$tC6" role="2OqNvi">
-                                                                        <ref role="37wK5l" to="wyt6:~String.substring(int):java.lang.String" resolve="substring" />
+                                                                        <ref role="37wK5l" to="wyt6:~String.substring(int)" resolve="substring" />
                                                                         <node concept="3cmrfG" id="3489cc5$r6w" role="37wK5m">
                                                                           <property role="3cmrfH" value="1" />
                                                                         </node>
@@ -61653,7 +61653,7 @@
                                                               <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                                             </node>
                                                             <node concept="liA8E" id="3489cc5$tCa" role="2OqNvi">
-                                                              <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                                              <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                                               <node concept="1Xhbcc" id="3489cc5$r6l" role="37wK5m">
                                                                 <property role="1XhdNS" value="\'" />
                                                               </node>
@@ -61669,7 +61669,7 @@
                                                             <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                                           </node>
                                                           <node concept="liA8E" id="3489cc5$tCe" role="2OqNvi">
-                                                            <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                                            <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                                             <node concept="1Xhbcc" id="3489cc5$r6b" role="37wK5m">
                                                               <property role="1XhdNS" value="\&quot;" />
                                                             </node>
@@ -61685,7 +61685,7 @@
                                                           <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                                         </node>
                                                         <node concept="liA8E" id="3489cc5$tCi" role="2OqNvi">
-                                                          <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                                          <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                                           <node concept="1Xhbcc" id="3489cc5$r61" role="37wK5m">
                                                             <property role="1XhdNS" value="&amp;" />
                                                           </node>
@@ -61701,7 +61701,7 @@
                                                         <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                                       </node>
                                                       <node concept="liA8E" id="3489cc5$tCm" role="2OqNvi">
-                                                        <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                                        <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                                         <node concept="1Xhbcc" id="3489cc5$r5R" role="37wK5m">
                                                           <property role="1XhdNS" value="&gt;" />
                                                         </node>
@@ -61717,7 +61717,7 @@
                                                       <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                                     </node>
                                                     <node concept="liA8E" id="3489cc5$tCq" role="2OqNvi">
-                                                      <ref role="37wK5l" to="wyt6:~StringBuffer.append(char):java.lang.StringBuffer" resolve="append" />
+                                                      <ref role="37wK5l" to="wyt6:~StringBuffer.append(char)" resolve="append" />
                                                       <node concept="1Xhbcc" id="3489cc5$r5H" role="37wK5m">
                                                         <property role="1XhdNS" value="&lt;" />
                                                       </node>
@@ -61771,7 +61771,7 @@
                                                     <ref role="3cqZAo" node="3489cc5$qWa" resolve="attributelist" />
                                                   </node>
                                                   <node concept="liA8E" id="3489cc5$tCw" role="2OqNvi">
-                                                    <ref role="37wK5l" to="33ny:~Hashtable.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
+                                                    <ref role="37wK5l" to="33ny:~Hashtable.put(java.lang.Object,java.lang.Object)" resolve="put" />
                                                     <node concept="37vLTw" id="3489cc5$r79" role="37wK5m">
                                                       <ref role="3cqZAo" node="3489cc5$r46" resolve="key" />
                                                     </node>
@@ -61780,7 +61780,7 @@
                                                         <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                                       </node>
                                                       <node concept="liA8E" id="3489cc5$tC$" role="2OqNvi">
-                                                        <ref role="37wK5l" to="wyt6:~StringBuffer.toString():java.lang.String" resolve="toString" />
+                                                        <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
                                                       </node>
                                                     </node>
                                                   </node>
@@ -61803,7 +61803,7 @@
                                                     <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                                   </node>
                                                   <node concept="liA8E" id="3489cc5$tCC" role="2OqNvi">
-                                                    <ref role="37wK5l" to="wyt6:~StringBuffer.toString():java.lang.String" resolve="toString" />
+                                                    <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
                                                   </node>
                                                 </node>
                                               </node>
@@ -61818,7 +61818,7 @@
                                           <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$tCG" role="2OqNvi">
-                                          <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int):void" resolve="setLength" />
+                                          <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int)" resolve="setLength" />
                                           <node concept="3cmrfG" id="3489cc5$r7d" role="37wK5m">
                                             <property role="3cmrfH" value="0" />
                                           </node>
@@ -61835,7 +61835,7 @@
                                             <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$tCK" role="2OqNvi">
-                                            <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                            <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                           </node>
                                         </node>
                                       </node>
@@ -61855,7 +61855,7 @@
                                               <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                             </node>
                                             <node concept="liA8E" id="3489cc5$tCO" role="2OqNvi">
-                                              <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                              <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                             </node>
                                           </node>
                                         </node>
@@ -61889,7 +61889,7 @@
                                           <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$tCU" role="2OqNvi">
-                                          <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                          <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                         </node>
                                       </node>
                                     </node>
@@ -61929,7 +61929,7 @@
                                             <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                           </node>
                                           <node concept="liA8E" id="3489cc5$tD0" role="2OqNvi">
-                                            <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                            <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                           </node>
                                         </node>
                                       </node>
@@ -62010,7 +62010,7 @@
                                           <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                         </node>
                                         <node concept="liA8E" id="3489cc5$tD6" role="2OqNvi">
-                                          <ref role="37wK5l" to="guwi:~BufferedReader.close():void" resolve="close" />
+                                          <ref role="37wK5l" to="guwi:~BufferedReader.close()" resolve="close" />
                                         </node>
                                       </node>
                                     </node>
@@ -62068,7 +62068,7 @@
                                         <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                       </node>
                                       <node concept="liA8E" id="3489cc5$tDa" role="2OqNvi">
-                                        <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                        <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                       </node>
                                     </node>
                                   </node>
@@ -62139,7 +62139,7 @@
                                       <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                     </node>
                                     <node concept="liA8E" id="3489cc5$tDg" role="2OqNvi">
-                                      <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                      <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                     </node>
                                   </node>
                                 </node>
@@ -62164,7 +62164,7 @@
                             <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                           </node>
                           <node concept="liA8E" id="3489cc5$tDk" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~StringBuffer.length():int" resolve="length" />
+                            <ref role="37wK5l" to="wyt6:~StringBuffer.length()" resolve="length" />
                           </node>
                         </node>
                         <node concept="3cmrfG" id="3489cc5$qWJ" role="3uHU7w">
@@ -62179,14 +62179,14 @@
                                 <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                               </node>
                               <node concept="liA8E" id="3489cc5$tDo" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~StringBuffer.charAt(int):char" resolve="charAt" />
+                                <ref role="37wK5l" to="wyt6:~StringBuffer.charAt(int)" resolve="charAt" />
                                 <node concept="3cpWsd" id="3489cc5$qWP" role="37wK5m">
                                   <node concept="2OqwBi" id="3489cc5$tDr" role="3uHU7B">
                                     <node concept="37vLTw" id="3489cc5$tDq" role="2Oq$k0">
                                       <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                     </node>
                                     <node concept="liA8E" id="3489cc5$tDs" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~StringBuffer.length():int" resolve="length" />
+                                      <ref role="37wK5l" to="wyt6:~StringBuffer.length()" resolve="length" />
                                     </node>
                                   </node>
                                   <node concept="3cmrfG" id="3489cc5$qWR" role="3uHU7w">
@@ -62206,14 +62206,14 @@
                                   <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$tDw" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int):void" resolve="setLength" />
+                                  <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int)" resolve="setLength" />
                                   <node concept="3cpWsd" id="3489cc5$qWX" role="37wK5m">
                                     <node concept="2OqwBi" id="3489cc5$tDz" role="3uHU7B">
                                       <node concept="37vLTw" id="3489cc5$tDy" role="2Oq$k0">
                                         <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                       </node>
                                       <node concept="liA8E" id="3489cc5$tD$" role="2OqNvi">
-                                        <ref role="37wK5l" to="wyt6:~StringBuffer.length():int" resolve="length" />
+                                        <ref role="37wK5l" to="wyt6:~StringBuffer.length()" resolve="length" />
                                       </node>
                                     </node>
                                     <node concept="3cmrfG" id="3489cc5$qWZ" role="3uHU7w">
@@ -62240,7 +62240,7 @@
                                     <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$tDC" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~StringBuffer.toString():java.lang.String" resolve="toString" />
+                                    <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
                                   </node>
                                 </node>
                               </node>
@@ -62268,7 +62268,7 @@
                               <ref role="3cqZAo" node="3489cc5$qWe" resolve="text" />
                             </node>
                             <node concept="liA8E" id="3489cc5$tDG" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int):void" resolve="setLength" />
+                              <ref role="37wK5l" to="wyt6:~StringBuffer.setLength(int)" resolve="setLength" />
                               <node concept="3cmrfG" id="3489cc5$qXa" role="37wK5m">
                                 <property role="3cmrfH" value="0" />
                               </node>
@@ -62322,7 +62322,7 @@
                             <ref role="3cqZAo" node="3489cc5$qXb" resolve="tagname" />
                           </node>
                           <node concept="liA8E" id="3489cc5$tDK" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                            <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                           </node>
                         </node>
                       </node>
@@ -62349,7 +62349,7 @@
                                     <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$tDO" role="2OqNvi">
-                                    <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                    <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                   </node>
                                 </node>
                               </node>
@@ -62359,7 +62359,7 @@
                                 <ref role="3cqZAo" node="3489cc5$qXb" resolve="tagname" />
                               </node>
                               <node concept="liA8E" id="3489cc5$tDS" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~String.charAt(int):char" resolve="charAt" />
+                                <ref role="37wK5l" to="wyt6:~String.charAt(int)" resolve="charAt" />
                                 <node concept="37vLTw" id="3489cc5$qXB" role="37wK5m">
                                   <ref role="3cqZAo" node="3489cc5$qXk" resolve="i" />
                                 </node>
@@ -62388,7 +62388,7 @@
                             <property role="Xl_RC" value=" \t\n\r" />
                           </node>
                           <node concept="liA8E" id="3489cc5$qXK" role="2OqNvi">
-                            <ref role="37wK5l" to="wyt6:~String.indexOf(int):int" resolve="indexOf" />
+                            <ref role="37wK5l" to="wyt6:~String.indexOf(int)" resolve="indexOf" />
                             <node concept="37vLTI" id="3489cc5$qXL" role="37wK5m">
                               <node concept="37vLTw" id="3489cc5$qXM" role="37vLTJ">
                                 <ref role="3cqZAo" node="3489cc5$qWj" resolve="c" />
@@ -62398,7 +62398,7 @@
                                   <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$tE9" role="2OqNvi">
-                                  <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                                  <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                                 </node>
                               </node>
                             </node>
@@ -62453,7 +62453,7 @@
                             <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                           </node>
                           <node concept="liA8E" id="3489cc5$tEf" role="2OqNvi">
-                            <ref role="37wK5l" to="guwi:~BufferedReader.read():int" resolve="read" />
+                            <ref role="37wK5l" to="guwi:~BufferedReader.read()" resolve="read" />
                           </node>
                         </node>
                       </node>
@@ -62491,7 +62491,7 @@
                               <ref role="3cqZAo" node="3489cc5$qVV" resolve="reader" />
                             </node>
                             <node concept="liA8E" id="3489cc5$tEj" role="2OqNvi">
-                              <ref role="37wK5l" to="guwi:~BufferedReader.close():void" resolve="close" />
+                              <ref role="37wK5l" to="guwi:~BufferedReader.close()" resolve="close" />
                             </node>
                           </node>
                         </node>
@@ -63502,7 +63502,7 @@
                                     <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$tHF" role="2OqNvi">
-                                    <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                                    <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                                     <node concept="37vLTw" id="3489cc5$rfG" role="37wK5m">
                                       <ref role="3cqZAo" node="3489cc5$rcz" resolve="value" />
                                     </node>
@@ -63515,7 +63515,7 @@
                                     <ref role="3cqZAo" node="3489cc5$rf_" resolve="exc" />
                                   </node>
                                   <node concept="liA8E" id="3489cc5$tHJ" role="2OqNvi">
-                                    <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace():void" resolve="printStackTrace" />
+                                    <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace()" resolve="printStackTrace" />
                                   </node>
                                 </node>
                               </node>
@@ -63542,13 +63542,13 @@
                                   <node concept="2OqwBi" id="3489cc5$rfw" role="10QFUP">
                                     <node concept="2YIFZM" id="3489cc5$tHL" role="2Oq$k0">
                                       <ref role="1Pybhc" to="wyt6:~Class" resolve="Class" />
-                                      <ref role="37wK5l" to="wyt6:~Class.forName(java.lang.String):java.lang.Class" resolve="forName" />
+                                      <ref role="37wK5l" to="wyt6:~Class.forName(java.lang.String)" resolve="forName" />
                                       <node concept="37vLTw" id="3489cc5$rfy" role="37wK5m">
                                         <ref role="3cqZAo" node="3489cc5$rcz" resolve="value" />
                                       </node>
                                     </node>
                                     <node concept="liA8E" id="3489cc5$rfz" role="2OqNvi">
-                                      <ref role="37wK5l" to="wyt6:~Class.newInstance():java.lang.Object" resolve="newInstance" />
+                                      <ref role="37wK5l" to="wyt6:~Class.newInstance()" resolve="newInstance" />
                                     </node>
                                   </node>
                                   <node concept="3uibUv" id="3489cc5$rf$" role="10QFUM">
@@ -63572,7 +63572,7 @@
                                   <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$tHP" role="2OqNvi">
-                                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+                                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
                                   <node concept="37vLTw" id="3489cc5$rfc" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$rcz" resolve="value" />
                                   </node>
@@ -63585,7 +63585,7 @@
                                   <ref role="3cqZAo" node="3489cc5$rf5" resolve="exc" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$tHT" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace():void" resolve="printStackTrace" />
+                                  <ref role="37wK5l" to="wyt6:~Throwable.printStackTrace()" resolve="printStackTrace" />
                                 </node>
                               </node>
                             </node>
@@ -63615,10 +63615,10 @@
                               </node>
                               <node concept="2OqwBi" id="3489cc5$rf0" role="37wK5m">
                                 <node concept="1rXfSq" id="3489cc5$rf1" role="2Oq$k0">
-                                  <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                                  <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$rf2" role="2OqNvi">
-                                  <ref role="37wK5l" to="wyt6:~Class.getMethod(java.lang.String,java.lang.Class...):java.lang.reflect.Method" resolve="getMethod" />
+                                  <ref role="37wK5l" to="wyt6:~Class.getMethod(java.lang.String,java.lang.Class...)" resolve="getMethod" />
                                   <node concept="37vLTw" id="3489cc5$rf3" role="37wK5m">
                                     <ref role="3cqZAo" node="3489cc5$rcz" resolve="value" />
                                   </node>
@@ -63678,7 +63678,7 @@
                       </node>
                       <node concept="2YIFZM" id="3489cc5$tHV" role="37wK5m">
                         <ref role="1Pybhc" to="wyt6:~Integer" resolve="Integer" />
-                        <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String):java.lang.Integer" resolve="valueOf" />
+                        <ref role="37wK5l" to="wyt6:~Integer.valueOf(java.lang.String)" resolve="valueOf" />
                         <node concept="37vLTw" id="3489cc5$rez" role="37wK5m">
                           <ref role="3cqZAo" node="3489cc5$rcz" resolve="value" />
                         </node>
@@ -63694,7 +63694,7 @@
                       <property role="Xl_RC" value="true" />
                     </node>
                     <node concept="liA8E" id="3489cc5$rdI" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                      <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                       <node concept="37vLTw" id="3489cc5$rdJ" role="37wK5m">
                         <ref role="3cqZAo" node="3489cc5$rcz" resolve="value" />
                       </node>
@@ -63706,7 +63706,7 @@
                         <property role="Xl_RC" value="false" />
                       </node>
                       <node concept="liA8E" id="3489cc5$re2" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                         <node concept="37vLTw" id="3489cc5$re3" role="37wK5m">
                           <ref role="3cqZAo" node="3489cc5$rcz" resolve="value" />
                         </node>
@@ -64073,7 +64073,7 @@
                               </node>
                             </node>
                             <node concept="liA8E" id="3489cc5$rh9" role="2OqNvi">
-                              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object):boolean" resolve="equals" />
+                              <ref role="37wK5l" to="wyt6:~Object.equals(java.lang.Object)" resolve="equals" />
                               <node concept="37vLTw" id="3489cc5$rha" role="37wK5m">
                                 <ref role="3cqZAo" node="3489cc5$rfY" resolve="key" />
                               </node>
@@ -64131,7 +64131,7 @@
                                           </node>
                                         </node>
                                         <node concept="liA8E" id="3489cc5$rh$" role="2OqNvi">
-                                          <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                                          <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                                         </node>
                                       </node>
                                     </node>
@@ -64963,7 +64963,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3489cc5$rm9" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Integer.intValue():int" resolve="intValue" />
+                <ref role="37wK5l" to="wyt6:~Integer.intValue()" resolve="intValue" />
               </node>
             </node>
           </node>
@@ -65075,7 +65075,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3489cc5$rmM" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Integer.intValue():int" resolve="intValue" />
+                <ref role="37wK5l" to="wyt6:~Integer.intValue()" resolve="intValue" />
               </node>
             </node>
           </node>
@@ -65746,7 +65746,7 @@
                         </node>
                         <node concept="2YIFZM" id="3489cc5$tRN" role="37vLTx">
                           <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                          <ref role="37wK5l" to="wyt6:~Math.abs(int):int" resolve="abs" />
+                          <ref role="37wK5l" to="wyt6:~Math.abs(int)" resolve="abs" />
                           <node concept="2OqwBi" id="3489cc5$tRQ" role="37wK5m">
                             <node concept="37vLTw" id="3489cc5$tRP" role="2Oq$k0">
                               <ref role="3cqZAo" node="3489cc5$rpO" resolve="bounds" />
@@ -65797,7 +65797,7 @@
                   <node concept="3clFbS" id="3489cc5$rqD" role="3clFbx">
                     <node concept="3clFbF" id="3489cc5$rqE" role="3cqZAp">
                       <node concept="1rXfSq" id="3489cc5$rqF" role="3clFbG">
-                        <ref role="37wK5l" to="z60i:~Component.repaint(int,int,int,int):void" resolve="repaint" />
+                        <ref role="37wK5l" to="z60i:~Component.repaint(int,int,int,int)" resolve="repaint" />
                         <node concept="37vLTw" id="3489cc5$rqG" role="37wK5m">
                           <ref role="3cqZAo" node="3489cc5$rpg" resolve="x" />
                         </node>
@@ -66094,7 +66094,7 @@
                       </node>
                       <node concept="2YIFZM" id="3489cc5$tS1" role="3uHU7w">
                         <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
-                        <ref role="37wK5l" to="wyt6:~Math.abs(int):int" resolve="abs" />
+                        <ref role="37wK5l" to="wyt6:~Math.abs(int)" resolve="abs" />
                         <node concept="2OqwBi" id="3489cc5$tS4" role="37wK5m">
                           <node concept="37vLTw" id="3489cc5$tS3" role="2Oq$k0">
                             <ref role="3cqZAo" node="3489cc5$rsi" resolve="bounds" />
@@ -66473,7 +66473,7 @@
                   <ref role="3cqZAo" node="3489cc5$rt_" resolve="value" />
                 </node>
                 <node concept="liA8E" id="3489cc5$tSd" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                   <node concept="AH0OO" id="3489cc5$ru7" role="37wK5m">
                     <node concept="37vLTw" id="3489cc5$ru8" role="AHHXb">
                       <ref role="3cqZAo" node="3489cc5$rtB" resolve="values" />
@@ -66844,7 +66844,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3489cc5$rw8" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Boolean.booleanValue():boolean" resolve="booleanValue" />
+                <ref role="37wK5l" to="wyt6:~Boolean.booleanValue()" resolve="booleanValue" />
               </node>
             </node>
           </node>
@@ -66999,7 +66999,7 @@
                 </node>
               </node>
               <node concept="liA8E" id="3489cc5$rwZ" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Integer.intValue():int" resolve="intValue" />
+                <ref role="37wK5l" to="wyt6:~Integer.intValue()" resolve="intValue" />
               </node>
             </node>
           </node>
@@ -67323,7 +67323,7 @@
                     <ref role="3cqZAo" node="3489cc5$ryn" resolve="path" />
                   </node>
                   <node concept="liA8E" id="3489cc5$tU8" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~String.length():int" resolve="length" />
+                    <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
                   </node>
                 </node>
                 <node concept="3cmrfG" id="3489cc5$ry$" role="3uHU7w">
@@ -67393,16 +67393,16 @@
                 <node concept="2OqwBi" id="3489cc5$ryN" role="37vLTx">
                   <node concept="2YIFZM" id="3489cc5$tUa" role="2Oq$k0">
                     <ref role="1Pybhc" to="z60i:~Toolkit" resolve="Toolkit" />
-                    <ref role="37wK5l" to="z60i:~Toolkit.getDefaultToolkit():java.awt.Toolkit" resolve="getDefaultToolkit" />
+                    <ref role="37wK5l" to="z60i:~Toolkit.getDefaultToolkit()" resolve="getDefaultToolkit" />
                   </node>
                   <node concept="liA8E" id="3489cc5$ryP" role="2OqNvi">
-                    <ref role="37wK5l" to="z60i:~Toolkit.getImage(java.net.URL):java.awt.Image" resolve="getImage" />
+                    <ref role="37wK5l" to="z60i:~Toolkit.getImage(java.net.URL)" resolve="getImage" />
                     <node concept="2OqwBi" id="3489cc5$ryQ" role="37wK5m">
                       <node concept="1rXfSq" id="3489cc5$ryR" role="2Oq$k0">
-                        <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                        <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                       </node>
                       <node concept="liA8E" id="3489cc5$ryS" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Class.getResource(java.lang.String):java.net.URL" resolve="getResource" />
+                        <ref role="37wK5l" to="wyt6:~Class.getResource(java.lang.String)" resolve="getResource" />
                         <node concept="37vLTw" id="3489cc5$ryT" role="37wK5m">
                           <ref role="3cqZAo" node="3489cc5$ryn" resolve="path" />
                         </node>
@@ -67448,10 +67448,10 @@
                     </node>
                     <node concept="2OqwBi" id="3489cc5$rzc" role="33vP2m">
                       <node concept="1rXfSq" id="3489cc5$rzd" role="2Oq$k0">
-                        <ref role="37wK5l" to="wyt6:~Object.getClass():java.lang.Class" resolve="getClass" />
+                        <ref role="37wK5l" to="wyt6:~Object.getClass()" resolve="getClass" />
                       </node>
                       <node concept="liA8E" id="3489cc5$rze" role="2OqNvi">
-                        <ref role="37wK5l" to="wyt6:~Class.getResourceAsStream(java.lang.String):java.io.InputStream" resolve="getResourceAsStream" />
+                        <ref role="37wK5l" to="wyt6:~Class.getResourceAsStream(java.lang.String)" resolve="getResourceAsStream" />
                         <node concept="37vLTw" id="3489cc5$rzf" role="37wK5m">
                           <ref role="3cqZAo" node="3489cc5$ryn" resolve="path" />
                         </node>
@@ -67487,7 +67487,7 @@
                                   <ref role="3cqZAo" node="3489cc5$rz9" resolve="is" />
                                 </node>
                                 <node concept="liA8E" id="3489cc5$tUe" role="2OqNvi">
-                                  <ref role="37wK5l" to="guwi:~InputStream.available():int" resolve="available" />
+                                  <ref role="37wK5l" to="guwi:~InputStream.available()" resolve="available" />
                                 </node>
                               </node>
                             </node>
@@ -67502,7 +67502,7 @@
                           <ref role="3cqZAo" node="3489cc5$rz9" resolve="is" />
                         </node>
                         <node concept="liA8E" id="3489cc5$tUi" role="2OqNvi">
-                          <ref role="37wK5l" to="guwi:~InputStream.read(byte[],int,int):int" resolve="read" />
+                          <ref role="37wK5l" to="guwi:~InputStream.read(byte[],int,int)" resolve="read" />
                           <node concept="37vLTw" id="3489cc5$rzx" role="37wK5m">
                             <ref role="3cqZAo" node="3489cc5$rzm" resolve="data" />
                           </node>
@@ -67525,10 +67525,10 @@
                         </node>
                         <node concept="2OqwBi" id="3489cc5$rzB" role="37vLTx">
                           <node concept="1rXfSq" id="3489cc5$rzC" role="2Oq$k0">
-                            <ref role="37wK5l" to="z60i:~Component.getToolkit():java.awt.Toolkit" resolve="getToolkit" />
+                            <ref role="37wK5l" to="z60i:~Component.getToolkit()" resolve="getToolkit" />
                           </node>
                           <node concept="liA8E" id="3489cc5$rzD" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~Toolkit.createImage(byte[]):java.awt.Image" resolve="createImage" />
+                            <ref role="37wK5l" to="z60i:~Toolkit.createImage(byte[])" resolve="createImage" />
                             <node concept="37vLTw" id="3489cc5$rzE" role="37wK5m">
                               <ref role="3cqZAo" node="3489cc5$rzm" resolve="data" />
                             </node>
@@ -67542,7 +67542,7 @@
                           <ref role="3cqZAo" node="3489cc5$rz9" resolve="is" />
                         </node>
                         <node concept="liA8E" id="3489cc5$tUq" role="2OqNvi">
-                          <ref role="37wK5l" to="guwi:~InputStream.close():void" resolve="close" />
+                          <ref role="37wK5l" to="guwi:~InputStream.close()" resolve="close" />
                         </node>
                       </node>
                     </node>
@@ -67613,7 +67613,7 @@
                   <ref role="3cqZAo" node="3489cc5$rzX" resolve="mediatracker" />
                 </node>
                 <node concept="liA8E" id="3489cc5$tUw" role="2OqNvi">
-                  <ref role="37wK5l" to="z60i:~MediaTracker.addImage(java.awt.Image,int):void" resolve="addImage" />
+                  <ref role="37wK5l" to="z60i:~MediaTracker.addImage(java.awt.Image,int)" resolve="addImage" />
                   <node concept="37vLTw" id="3489cc5$r$4" role="37wK5m">
                     <ref role="3cqZAo" node="3489cc5$ryE" resolve="image" />
                   </node>
@@ -67641,7 +67641,7 @@
                       <ref role="3cqZAo" node="3489cc5$rzX" resolve="mediatracker" />
                     </node>
                     <node concept="liA8E" id="3489cc5$tU$" role="2OqNvi">
-                      <ref role="37wK5l" to="z60i:~MediaTracker.waitForID(int,long):boolean" resolve="waitForID" />
+                      <ref role="37wK5l" to="z60i:~MediaTracker.waitForID(int,long)" resolve="waitForID" />
                       <node concept="3cmrfG" id="3489cc5$r$a" role="37wK5m">
                         <property role="3cmrfH" value="1" />
                       </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps
index b580a5cb..710dfe9c 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.helloWorld.mps
@@ -189,7 +189,7 @@
               <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
             </node>
             <node concept="liA8E" id="3Qp4N06bAlY" role="2OqNvi">
-              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String):void" resolve="println" />
+              <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
               <node concept="Xl_RD" id="3Qp4N06bAlZ" role="37wK5m">
                 <property role="Xl_RC" value="Hello, world!" />
               </node>
@@ -201,10 +201,10 @@
           <node concept="2OqwBi" id="6flDoy9UcrU" role="3clFbG">
             <node concept="2YIFZM" id="3xj1Usc_M0M" role="2Oq$k0">
               <ref role="1Pybhc" to="wyt6:~System" resolve="System" />
-              <ref role="37wK5l" to="wyt6:~System.getenv():java.util.Map" resolve="getenv" />
+              <ref role="37wK5l" to="wyt6:~System.getenv()" resolve="getenv" />
             </node>
             <node concept="liA8E" id="6flDoy9UcGV" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object):java.lang.Object" resolve="get" />
+              <ref role="37wK5l" to="33ny:~Map.get(java.lang.Object)" resolve="get" />
               <node concept="Xl_RD" id="6flDoy9UcNr" role="37wK5m">
                 <property role="Xl_RC" value="MPS_HOME" />
               </node>
@@ -597,7 +597,7 @@
                   <ref role="3cqZAo" node="5bC6UNlLkmm" resolve="res1" />
                 </node>
                 <node concept="liA8E" id="3g$8GQBPjvy" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object):boolean" resolve="equals" />
+                  <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
                   <node concept="Xl_RD" id="3g$8GQBPjwK" role="37wK5m">
                     <property role="Xl_RC" value="bcd" />
                   </node>
@@ -672,7 +672,7 @@
               <ref role="3cqZAo" node="W6bnNduw42" resolve="table" />
             </node>
             <node concept="liA8E" id="W6bnNduwWl" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~Hashtable.put(java.lang.Object,java.lang.Object):java.lang.Object" resolve="put" />
+              <ref role="37wK5l" to="33ny:~Hashtable.put(java.lang.Object,java.lang.Object)" resolve="put" />
               <node concept="37vLTw" id="W6bnNdux9p" role="37wK5m">
                 <ref role="3cqZAo" node="W6bnNduwoV" resolve="key" />
               </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps
index b658f8b3..0ff2644b 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/models/typechecking.samples.baseLanguage.slice.mps
@@ -760,7 +760,7 @@
                 <ref role="3cqZAo" node="61vfVfpb5yr" resolve="o" />
               </node>
               <node concept="liA8E" id="61vfVfpb5$U" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~Object.hashCode():int" resolve="hashCode" />
+                <ref role="37wK5l" to="wyt6:~Object.hashCode()" resolve="hashCode" />
               </node>
             </node>
           </node>
@@ -971,7 +971,7 @@
                   <ref role="3cqZAo" node="61vfVfpb5yN" resolve="myValue" />
                 </node>
                 <node concept="liA8E" id="61vfVfpb5_7" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Object.toString():java.lang.String" resolve="toString" />
+                  <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
                 </node>
               </node>
             </node>
diff --git a/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
index 21437479..627ff250 100644
--- a/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
+++ b/samples/mpscore/solutions/typechecking.samples.baseLanguage/typechecking.samples.baseLanguage.msd
@@ -26,7 +26,7 @@
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="4" />
-    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="13" />
+    <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="15" />
     <language slang="l:8585453e-6bfb-4d80-98de-b16074f1d86c:jetbrains.mps.lang.test" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:0b80a2e8-f9f1-47b3-823f-56eb115bca42:jetbrains.mps.typechecking.annotation" version="0" />