From fa4fb3a0c885bcd5d2da221aba8540e71811e07e Mon Sep 17 00:00:00 2001
From: "Mihail.Buryakov" <Mihail.Buryakov@jetbrains.com>
Date: Thu, 20 Aug 2015 11:43:24 +0200
Subject: [PATCH] SubclassingUtil: implicitly inlude Object in paths, some
 refactoring

---
 .../typesystem2/samplechecker/test/type.mps   |  214 +++-
 .../typesystem2/samplechecker/template.mps    | 1082 +++++++----------
 .../mps/lang/typesystem2/template.mps         |   21 +-
 3 files changed, 575 insertions(+), 742 deletions(-)

diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps
index 3ad9e587..b4b52333 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker.test/models/jetbrains/mps/lang/typesystem2/samplechecker/test/type.mps
@@ -17,7 +17,7 @@
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="tp68" ref="r:00000000-0000-4000-0000-011c895903ac(jetbrains.mps.baseLanguageInternal.structure)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
   </imports>
   <registry>
     <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
@@ -124,6 +124,7 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
@@ -172,7 +173,6 @@
       </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
       <concept id="1227264722563" name="jetbrains.mps.lang.smodel.structure.EqualsStructurallyExpression" flags="nn" index="2YFouu" />
       <concept id="1219352745532" name="jetbrains.mps.lang.smodel.structure.NodeRefExpression" flags="nn" index="3B5_sB">
         <reference id="1219352800908" name="referentNode" index="3B5MYn" />
@@ -181,7 +181,9 @@
         <reference id="1140138128738" name="concept" index="1PxNhF" />
         <child id="1140138123956" name="leftExpression" index="1PxMeX" />
       </concept>
-      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
+      <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
+        <reference id="1138405853777" name="concept" index="ehGHo" />
+      </concept>
       <concept id="1138056282393" name="jetbrains.mps.lang.smodel.structure.SLinkListAccess" flags="nn" index="3Tsc0h">
         <reference id="1138056546658" name="link" index="3TtcxE" />
       </concept>
@@ -203,6 +205,7 @@
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1202128969694" name="jetbrains.mps.baseLanguage.collections.structure.SelectOperation" flags="nn" index="3$u5V9" />
       <concept id="9042586985346099698" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachStatement" flags="nn" index="1_o_46">
         <child id="9042586985346099734" name="forEach" index="1_o_by" />
@@ -260,6 +263,29 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbJ" id="2shrukTDcgC" role="3cqZAp">
+          <node concept="3clFbS" id="2shrukTDcgE" role="3clFbx">
+            <node concept="3cpWs6" id="2shrukTDf$T" role="3cqZAp">
+              <node concept="3clFbT" id="2shrukTDfJ5" role="3cqZAk">
+                <property role="3clFbU" value="false" />
+              </node>
+            </node>
+          </node>
+          <node concept="3y3z36" id="2shrukTDe5t" role="3clFbw">
+            <node concept="2OqwBi" id="2shrukTDerF" role="3uHU7w">
+              <node concept="37vLTw" id="2shrukTDe6p" role="2Oq$k0">
+                <ref role="3cqZAo" node="7t5VLKGSeo4" resolve="ys" />
+              </node>
+              <node concept="34oBXx" id="2shrukTDfzB" role="2OqNvi" />
+            </node>
+            <node concept="2OqwBi" id="2shrukTDcEv" role="3uHU7B">
+              <node concept="37vLTw" id="2shrukTDcqG" role="2Oq$k0">
+                <ref role="3cqZAo" node="7t5VLKGSekn" resolve="xs" />
+              </node>
+              <node concept="34oBXx" id="2shrukTDddU" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
         <node concept="1_o_46" id="7t5VLKGS9Rv" role="3cqZAp">
           <node concept="3clFbS" id="7t5VLKGS9Rw" role="2LFqv$">
             <node concept="3clFbJ" id="7t5VLKGSeBE" role="3cqZAp">
@@ -453,12 +479,13 @@
       <property role="TrG5h" value="subclassing_C" />
       <node concept="3cqZAl" id="7t5VLKGB11V" role="3clF45" />
       <node concept="3clFbS" id="7t5VLKGB11Z" role="3clF47">
-        <node concept="3clFbH" id="7t5VLKGT7Ki" role="3cqZAp" />
         <node concept="3cpWs8" id="7t5VLKGThb5" role="3cqZAp">
           <node concept="3cpWsn" id="7t5VLKGThb6" role="3cpWs9">
             <property role="TrG5h" value="expected" />
             <node concept="_YKpA" id="7t5VLKGThaQ" role="1tU5fm">
-              <node concept="2I9FWS" id="7t5VLKGThaT" role="_ZDj9" />
+              <node concept="_YKpA" id="2shrukTDgQW" role="_ZDj9">
+                <node concept="3Tqbb2" id="2shrukTDgQX" role="_ZDj9" />
+              </node>
             </node>
             <node concept="2OqwBi" id="7t5VLKGThb7" role="33vP2m">
               <node concept="2OqwBi" id="7t5VLKGThb8" role="2Oq$k0">
@@ -498,7 +525,25 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4JRKVCvax8H" role="3cqZAp" />
+        <node concept="3cpWs8" id="2shrukTDvVU" role="3cqZAp">
+          <node concept="3cpWsn" id="2shrukTDvVV" role="3cpWs9">
+            <property role="TrG5h" value="found" />
+            <node concept="_YKpA" id="2shrukTDvVL" role="1tU5fm">
+              <node concept="_YKpA" id="2shrukTDvVS" role="_ZDj9">
+                <node concept="3Tqbb2" id="2shrukTDvVT" role="_ZDj9">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
+              </node>
+            </node>
+            <node concept="2YIFZM" id="2shrukTDvVW" role="33vP2m">
+              <ref role="37wK5l" to="kqnc:5H6hZahiCgu" resolve="allSubtypePathsTo" />
+              <ref role="1Pybhc" to="kqnc:tIwzd2cJHD" resolve="SubclassingUtil" />
+              <node concept="3xONca" id="2shrukTDvVX" role="37wK5m">
+                <ref role="3xOPvv" node="7t5VLKGTHET" resolve="C" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3vwNmj" id="7t5VLKGSich" role="3cqZAp">
           <node concept="2OqwBi" id="7t5VLKGSj7i" role="3vwVQn">
             <node concept="2WthIp" id="7t5VLKGSj7l" role="2Oq$k0" />
@@ -507,12 +552,8 @@
               <node concept="37vLTw" id="7t5VLKGSjv4" role="2XxRq1">
                 <ref role="3cqZAo" node="7t5VLKGThb6" resolve="expected" />
               </node>
-              <node concept="2YIFZM" id="7t5VLKGSupd" role="2XxRq1">
-                <ref role="37wK5l" to="kqnc:5H6hZahiCgu" resolve="allSubtypePathsTo" />
-                <ref role="1Pybhc" to="kqnc:tIwzd2cJHD" resolve="SubclassingUtil" />
-                <node concept="3xONca" id="7t5VLKGTHPX" role="37wK5m">
-                  <ref role="3xOPvv" node="7t5VLKGTHET" resolve="C" />
-                </node>
+              <node concept="37vLTw" id="2shrukTDvVY" role="2XxRq1">
+                <ref role="3cqZAo" node="2shrukTDvVV" resolve="found" />
               </node>
             </node>
           </node>
@@ -523,12 +564,13 @@
       <property role="TrG5h" value="subclassing_D" />
       <node concept="3cqZAl" id="7t5VLKGTHe9" role="3clF45" />
       <node concept="3clFbS" id="7t5VLKGTHea" role="3clF47">
-        <node concept="3clFbH" id="7t5VLKGTHeb" role="3cqZAp" />
         <node concept="3cpWs8" id="7t5VLKGTHec" role="3cqZAp">
           <node concept="3cpWsn" id="7t5VLKGTHed" role="3cpWs9">
             <property role="TrG5h" value="expected" />
             <node concept="_YKpA" id="7t5VLKGTHee" role="1tU5fm">
-              <node concept="2I9FWS" id="7t5VLKGTHef" role="_ZDj9" />
+              <node concept="_YKpA" id="2shrukTDgsO" role="_ZDj9">
+                <node concept="3Tqbb2" id="2shrukTDgE0" role="_ZDj9" />
+              </node>
             </node>
             <node concept="2OqwBi" id="7t5VLKGTHeg" role="33vP2m">
               <node concept="2OqwBi" id="7t5VLKGTHeh" role="2Oq$k0">
@@ -568,7 +610,25 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="7t5VLKGTHew" role="3cqZAp" />
+        <node concept="3cpWs8" id="2shrukTC76x" role="3cqZAp">
+          <node concept="3cpWsn" id="2shrukTC76y" role="3cpWs9">
+            <property role="TrG5h" value="found" />
+            <node concept="_YKpA" id="2shrukTC76n" role="1tU5fm">
+              <node concept="_YKpA" id="2shrukTC76u" role="_ZDj9">
+                <node concept="3Tqbb2" id="2shrukTC76v" role="_ZDj9">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
+              </node>
+            </node>
+            <node concept="2YIFZM" id="2shrukTDfVZ" role="33vP2m">
+              <ref role="37wK5l" to="kqnc:5H6hZahiCgu" resolve="allSubtypePathsTo" />
+              <ref role="1Pybhc" to="kqnc:tIwzd2cJHD" resolve="SubclassingUtil" />
+              <node concept="3xONca" id="2shrukTDfW0" role="37wK5m">
+                <ref role="3xOPvv" node="7t5VLKGGsK4" resolve="D" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3vwNmj" id="7t5VLKGTHex" role="3cqZAp">
           <node concept="2OqwBi" id="7t5VLKGTHey" role="3vwVQn">
             <node concept="2WthIp" id="7t5VLKGTHez" role="2Oq$k0" />
@@ -577,12 +637,8 @@
               <node concept="37vLTw" id="7t5VLKGTHe_" role="2XxRq1">
                 <ref role="3cqZAo" node="7t5VLKGTHed" resolve="expected" />
               </node>
-              <node concept="2YIFZM" id="7t5VLKGTHeA" role="2XxRq1">
-                <ref role="37wK5l" to="kqnc:5H6hZahiCgu" resolve="allSubtypePathsTo" />
-                <ref role="1Pybhc" to="kqnc:tIwzd2cJHD" resolve="SubclassingUtil" />
-                <node concept="3xONca" id="7t5VLKGTHeB" role="37wK5m">
-                  <ref role="3xOPvv" node="7t5VLKGGsK4" resolve="D" />
-                </node>
+              <node concept="37vLTw" id="2shrukTC76_" role="2XxRq1">
+                <ref role="3cqZAo" node="2shrukTC76y" resolve="found" />
               </node>
             </node>
           </node>
@@ -593,12 +649,13 @@
       <property role="TrG5h" value="subclassing_String" />
       <node concept="3cqZAl" id="4JRKVCv9wTl" role="3clF45" />
       <node concept="3clFbS" id="4JRKVCv9wTm" role="3clF47">
-        <node concept="3clFbH" id="4JRKVCv9wTn" role="3cqZAp" />
         <node concept="3cpWs8" id="4JRKVCv9wTo" role="3cqZAp">
           <node concept="3cpWsn" id="4JRKVCv9wTp" role="3cpWs9">
             <property role="TrG5h" value="expected" />
             <node concept="_YKpA" id="4JRKVCv9wTq" role="1tU5fm">
-              <node concept="2I9FWS" id="4JRKVCv9wTr" role="_ZDj9" />
+              <node concept="_YKpA" id="2shrukTDh0H" role="_ZDj9">
+                <node concept="3Tqbb2" id="2shrukTDh0I" role="_ZDj9" />
+              </node>
             </node>
             <node concept="2OqwBi" id="4JRKVCv9wTs" role="33vP2m">
               <node concept="2OqwBi" id="4JRKVCv9wTt" role="2Oq$k0">
@@ -638,7 +695,25 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4JRKVCv9wTG" role="3cqZAp" />
+        <node concept="3cpWs8" id="2shrukTAX1n" role="3cqZAp">
+          <node concept="3cpWsn" id="2shrukTAX1o" role="3cpWs9">
+            <property role="TrG5h" value="found" />
+            <node concept="_YKpA" id="2shrukTAX1d" role="1tU5fm">
+              <node concept="_YKpA" id="2shrukTAX1k" role="_ZDj9">
+                <node concept="3Tqbb2" id="2shrukTAX1l" role="_ZDj9">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
+              </node>
+            </node>
+            <node concept="2YIFZM" id="2shrukTBZPV" role="33vP2m">
+              <ref role="37wK5l" to="kqnc:5H6hZahiCgu" resolve="allSubtypePathsTo" />
+              <ref role="1Pybhc" to="kqnc:tIwzd2cJHD" resolve="SubclassingUtil" />
+              <node concept="3B5_sB" id="2shrukTBZPW" role="37wK5m">
+                <ref role="3B5MYn" to="wyt6:~String" resolve="String" />
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3vwNmj" id="4JRKVCv9wTH" role="3cqZAp">
           <node concept="2OqwBi" id="4JRKVCv9wTI" role="3vwVQn">
             <node concept="2WthIp" id="4JRKVCv9wTJ" role="2Oq$k0" />
@@ -647,12 +722,8 @@
               <node concept="37vLTw" id="4JRKVCv9wTL" role="2XxRq1">
                 <ref role="3cqZAo" node="4JRKVCv9wTp" resolve="expected" />
               </node>
-              <node concept="2YIFZM" id="4JRKVCv9wTM" role="2XxRq1">
-                <ref role="37wK5l" to="kqnc:5H6hZahiCgu" resolve="allSubtypePathsTo" />
-                <ref role="1Pybhc" to="kqnc:tIwzd2cJHD" resolve="SubclassingUtil" />
-                <node concept="3B5_sB" id="4JRKVCv9xP4" role="37wK5m">
-                  <ref role="3B5MYn" to="wyt6:~String" resolve="String" />
-                </node>
+              <node concept="37vLTw" id="2shrukTAX1r" role="2XxRq1">
+                <ref role="3cqZAo" node="2shrukTAX1o" resolve="found" />
               </node>
             </node>
           </node>
@@ -743,6 +814,21 @@
       <node concept="1niqFM" id="7t5VLKGT7Ag" role="1qenE9">
         <property role="1npL6y" value="expect" />
         <property role="1npUBZ" value="_" />
+        <node concept="1nCR9W" id="7t5VLKGTkW3" role="2U24H$">
+          <property role="1nD$Q0" value="_" />
+          <node concept="3uibUv" id="4JRKVCv8f9O" role="3HumAs">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+          <node concept="3uibUv" id="7t5VLKGTl50" role="3HumAs">
+            <ref role="3uigEE" node="7t5VLKGB10f" resolve="Container.A" />
+          </node>
+          <node concept="3uibUv" id="7t5VLKGTl5$" role="3HumAs">
+            <ref role="3uigEE" node="7t5VLKGB117" resolve="Container.B" />
+          </node>
+          <node concept="3uibUv" id="2shrukTDfVx" role="3HumAs">
+            <ref role="3uigEE" node="7t5VLKGGr0Y" resolve="Container.C" />
+          </node>
+        </node>
         <node concept="1nCR9W" id="7t5VLKGTkLF" role="2U24H$">
           <property role="1nD$Q0" value="_" />
           <node concept="3uibUv" id="4JRKVCv8f92" role="3HumAs">
@@ -754,17 +840,8 @@
           <node concept="3uibUv" id="7t5VLKGTkV4" role="3HumAs">
             <ref role="3uigEE" node="7t5VLKGGqYv" resolve="Container.J" />
           </node>
-        </node>
-        <node concept="1nCR9W" id="7t5VLKGTkW3" role="2U24H$">
-          <property role="1nD$Q0" value="_" />
-          <node concept="3uibUv" id="4JRKVCv8f9O" role="3HumAs">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-          <node concept="3uibUv" id="7t5VLKGTl50" role="3HumAs">
-            <ref role="3uigEE" node="7t5VLKGB10f" resolve="Container.A" />
-          </node>
-          <node concept="3uibUv" id="7t5VLKGTl5$" role="3HumAs">
-            <ref role="3uigEE" node="7t5VLKGB117" resolve="Container.B" />
+          <node concept="3uibUv" id="2shrukTDfUF" role="3HumAs">
+            <ref role="3uigEE" node="7t5VLKGGr0Y" resolve="Container.C" />
           </node>
         </node>
         <node concept="3cqZAl" id="7t5VLKGT7Fw" role="32Mpfj" />
@@ -785,20 +862,8 @@
           <node concept="3uibUv" id="7t5VLKGTGnY" role="3HumAs">
             <ref role="3uigEE" node="7t5VLKGGqZh" resolve="Container.K" />
           </node>
-        </node>
-        <node concept="1nCR9W" id="7t5VLKGTGnZ" role="2U24H$">
-          <property role="1nD$Q0" value="_" />
-          <node concept="3uibUv" id="4JRKVCv8fbq" role="3HumAs">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-          <node concept="3uibUv" id="7t5VLKGTGo0" role="3HumAs">
-            <ref role="3uigEE" node="7t5VLKGGqF7" resolve="Container.I" />
-          </node>
-          <node concept="3uibUv" id="7t5VLKGTGo1" role="3HumAs">
-            <ref role="3uigEE" node="7t5VLKGGqYv" resolve="Container.J" />
-          </node>
-          <node concept="3uibUv" id="7t5VLKGTGo2" role="3HumAs">
-            <ref role="3uigEE" node="7t5VLKGGr0Y" resolve="Container.C" />
+          <node concept="3uibUv" id="2shrukTDfTh" role="3HumAs">
+            <ref role="3uigEE" node="7t5VLKGGr2e" resolve="Container.D" />
           </node>
         </node>
         <node concept="1nCR9W" id="7t5VLKGTGo3" role="2U24H$">
@@ -815,6 +880,27 @@
           <node concept="3uibUv" id="7t5VLKGTGo6" role="3HumAs">
             <ref role="3uigEE" node="7t5VLKGGr0Y" resolve="Container.C" />
           </node>
+          <node concept="3uibUv" id="2shrukTDfUc" role="3HumAs">
+            <ref role="3uigEE" node="7t5VLKGGr2e" resolve="Container.D" />
+          </node>
+        </node>
+        <node concept="1nCR9W" id="7t5VLKGTGnZ" role="2U24H$">
+          <property role="1nD$Q0" value="_" />
+          <node concept="3uibUv" id="4JRKVCv8fbq" role="3HumAs">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+          <node concept="3uibUv" id="7t5VLKGTGo0" role="3HumAs">
+            <ref role="3uigEE" node="7t5VLKGGqF7" resolve="Container.I" />
+          </node>
+          <node concept="3uibUv" id="7t5VLKGTGo1" role="3HumAs">
+            <ref role="3uigEE" node="7t5VLKGGqYv" resolve="Container.J" />
+          </node>
+          <node concept="3uibUv" id="7t5VLKGTGo2" role="3HumAs">
+            <ref role="3uigEE" node="7t5VLKGGr0Y" resolve="Container.C" />
+          </node>
+          <node concept="3uibUv" id="2shrukTDfTH" role="3HumAs">
+            <ref role="3uigEE" node="7t5VLKGGr2e" resolve="Container.D" />
+          </node>
         </node>
         <node concept="3cqZAl" id="7t5VLKGTGo7" role="32Mpfj" />
         <node concept="3xLA65" id="7t5VLKGTGo8" role="lGtFl">
@@ -826,6 +912,15 @@
       <node concept="1niqFM" id="4JRKVCv8K68" role="1qenE9">
         <property role="1npL6y" value="expect" />
         <property role="1npUBZ" value="_" />
+        <node concept="1nCR9W" id="4JRKVCv9wNK" role="2U24H$">
+          <property role="1nD$Q0" value="_" />
+          <node concept="3uibUv" id="4JRKVCv9wNL" role="3HumAs">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+          <node concept="3uibUv" id="4JRKVCv9wNN" role="3HumAs">
+            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
+          </node>
+        </node>
         <node concept="1nCR9W" id="4JRKVCv8K69" role="2U24H$">
           <property role="1nD$Q0" value="_" />
           <node concept="3uibUv" id="4JRKVCv8K6a" role="3HumAs">
@@ -865,15 +960,6 @@
             <ref role="3uigEE" to="wyt6:~String" resolve="String" />
           </node>
         </node>
-        <node concept="1nCR9W" id="4JRKVCv9wNK" role="2U24H$">
-          <property role="1nD$Q0" value="_" />
-          <node concept="3uibUv" id="4JRKVCv9wNL" role="3HumAs">
-            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-          </node>
-          <node concept="3uibUv" id="4JRKVCv9wNN" role="3HumAs">
-            <ref role="3uigEE" to="wyt6:~String" resolve="String" />
-          </node>
-        </node>
         <node concept="3cqZAl" id="4JRKVCv8K6m" role="32Mpfj" />
         <node concept="3xLA65" id="4JRKVCv8K6n" role="lGtFl">
           <property role="TrG5h" value="expected_String" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
index 68126206..df542669 100644
--- a/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/sandbox/jetbrains.mps.lang.typesystem2.samplechecker/models/jetbrains/mps/lang/typesystem2/samplechecker/template.mps
@@ -153,6 +153,9 @@
         <property id="1068580320021" name="value" index="3cmrfH" />
       </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
+        <child id="1068581517676" name="expression" index="3cqZAk" />
+      </concept>
       <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
@@ -407,6 +410,7 @@
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1171391069720" name="jetbrains.mps.baseLanguage.collections.structure.GetIndexOfOperation" flags="nn" index="2WmjW8" />
+      <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
       <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="1175845471038" name="jetbrains.mps.baseLanguage.collections.structure.ReverseOperation" flags="nn" index="35Qw8J" />
       <concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -5171,8 +5175,10 @@
       <node concept="2cfxa9" id="tIwzd2dTRX" role="39759w">
         <node concept="391aah" id="tIwzd2dTRY" role="390Shn">
           <property role="TrG5h" value="supertypePath" />
-          <node concept="2I9FWS" id="tIwzd2dTRZ" role="390C7c">
-            <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+          <node concept="_YKpA" id="2shrukT$OE1" role="390C7c">
+            <node concept="3Tqbb2" id="2shrukT$PJT" role="_ZDj9">
+              <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+            </node>
           </node>
         </node>
         <node concept="3clFbS" id="tIwzd2dTS0" role="16YjZG">
@@ -5965,7 +5971,9 @@
         <node concept="391aah" id="2q0gzCFIXgU" role="390Shn">
           <property role="TrG5h" value="subtypePaths" />
           <node concept="_YKpA" id="2q0gzCFIXh2" role="390C7c">
-            <node concept="2I9FWS" id="2q0gzCFIXhd" role="_ZDj9" />
+            <node concept="_YKpA" id="2shrukT_gze" role="_ZDj9">
+              <node concept="3Tqbb2" id="2shrukT_gKV" role="_ZDj9" />
+            </node>
           </node>
         </node>
       </node>
@@ -8716,14 +8724,18 @@
           <node concept="3cpWsn" id="tIwzd2cKZJ" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="tIwzd2cKZK" role="1tU5fm">
-              <node concept="2I9FWS" id="tIwzd2cKZL" role="_ZDj9">
-                <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+              <node concept="_YKpA" id="2shrukTzA1N" role="_ZDj9">
+                <node concept="3Tqbb2" id="2shrukTzA1O" role="_ZDj9">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
               </node>
             </node>
             <node concept="2ShNRf" id="tIwzd2cKZM" role="33vP2m">
               <node concept="Tc6Ow" id="tIwzd2cKZN" role="2ShVmc">
-                <node concept="2I9FWS" id="tIwzd2cKZO" role="HW$YZ">
-                  <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+                <node concept="_YKpA" id="2shrukTzA9W" role="HW$YZ">
+                  <node concept="3Tqbb2" id="2shrukTzA9X" role="_ZDj9">
+                    <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -8737,8 +8749,10 @@
                 <node concept="3Tqbb2" id="tIwzd2cKZT" role="1Lm7xW">
                   <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
                 </node>
-                <node concept="2I9FWS" id="tIwzd2cKZU" role="1Lm7xW">
-                  <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+                <node concept="_YKpA" id="2shrukTzEot" role="1Lm7xW">
+                  <node concept="3Tqbb2" id="2shrukTzEou" role="_ZDj9">
+                    <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -8748,8 +8762,10 @@
                   <node concept="3Tqbb2" id="tIwzd2cKZY" role="1Lm7xW">
                     <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
                   </node>
-                  <node concept="2I9FWS" id="tIwzd2cKZZ" role="1Lm7xW">
-                    <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  <node concept="_YKpA" id="2shrukTzFzN" role="1Lm7xW">
+                    <node concept="3Tqbb2" id="2shrukTzFzO" role="_ZDj9">
+                      <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                    </node>
                   </node>
                 </node>
                 <node concept="1Ls8ON" id="tIwzd2cL00" role="HW$Y0">
@@ -8778,8 +8794,10 @@
                   <node concept="3Tqbb2" id="tIwzd2cL0b" role="1Lm7xW">
                     <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
                   </node>
-                  <node concept="2I9FWS" id="tIwzd2cL0c" role="1Lm7xW">
-                    <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  <node concept="_YKpA" id="2shrukTzGCm" role="1Lm7xW">
+                    <node concept="3Tqbb2" id="2shrukTzGCn" role="_ZDj9">
+                      <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                    </node>
                   </node>
                 </node>
                 <node concept="2OqwBi" id="tIwzd2cL0d" role="33vP2m">
@@ -8793,8 +8811,10 @@
             <node concept="3clFbH" id="tIwzd2cL0g" role="3cqZAp" />
             <node concept="3cpWs8" id="tIwzd2cL0h" role="3cqZAp">
               <node concept="3cpWsn" id="tIwzd2cL0i" role="3cpWs9">
-                <property role="TrG5h" value="n" />
-                <node concept="3Tqbb2" id="tIwzd2cL0j" role="1tU5fm" />
+                <property role="TrG5h" value="top" />
+                <node concept="3Tqbb2" id="tIwzd2cL0j" role="1tU5fm">
+                  <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                </node>
                 <node concept="1LFfDK" id="tIwzd2cL0k" role="33vP2m">
                   <node concept="3cmrfG" id="tIwzd2cL0l" role="1LF_Uc">
                     <property role="3cmrfH" value="0" />
@@ -8808,9 +8828,6 @@
             <node concept="3cpWs8" id="tIwzd2cL0n" role="3cqZAp">
               <node concept="3cpWsn" id="tIwzd2cL0o" role="3cpWs9">
                 <property role="TrG5h" value="path" />
-                <node concept="2I9FWS" id="tIwzd2cL0p" role="1tU5fm">
-                  <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
-                </node>
                 <node concept="1LFfDK" id="tIwzd2cL0q" role="33vP2m">
                   <node concept="3cmrfG" id="tIwzd2cL0r" role="1LF_Uc">
                     <property role="3cmrfH" value="1" />
@@ -8819,8 +8836,14 @@
                     <ref role="3cqZAo" node="tIwzd2cL09" resolve="pair" />
                   </node>
                 </node>
+                <node concept="_YKpA" id="2shrukTzHoW" role="1tU5fm">
+                  <node concept="3Tqbb2" id="2shrukTzHoX" role="_ZDj9">
+                    <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  </node>
+                </node>
               </node>
             </node>
+            <node concept="3clFbH" id="2shrukT$61M" role="3cqZAp" />
             <node concept="3clFbJ" id="tIwzd2cL0t" role="3cqZAp">
               <node concept="3clFbS" id="tIwzd2cL0u" role="3clFbx">
                 <node concept="3clFbF" id="tIwzd2cL0v" role="3cqZAp">
@@ -8844,287 +8867,74 @@
               </node>
             </node>
             <node concept="3clFbH" id="tIwzd2cL0B" role="3cqZAp" />
-            <node concept="3clFbJ" id="tIwzd2cL0C" role="3cqZAp">
-              <node concept="3clFbS" id="tIwzd2cL0D" role="3clFbx">
-                <node concept="1DcWWT" id="tIwzd2cL0E" role="3cqZAp">
-                  <node concept="3clFbS" id="tIwzd2cL0F" role="2LFqv$">
-                    <node concept="3cpWs8" id="tIwzd2cL0G" role="3cqZAp">
-                      <node concept="3cpWsn" id="tIwzd2cL0H" role="3cpWs9">
-                        <property role="TrG5h" value="list" />
-                        <node concept="_YKpA" id="tIwzd2cL0I" role="1tU5fm">
-                          <node concept="3Tqbb2" id="tIwzd2cL0J" role="_ZDj9">
-                            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                          </node>
-                        </node>
-                        <node concept="2ShNRf" id="tIwzd2cL0K" role="33vP2m">
-                          <node concept="Tc6Ow" id="tIwzd2cL0L" role="2ShVmc">
-                            <node concept="3Tqbb2" id="tIwzd2cL0M" role="HW$YZ">
-                              <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                            </node>
-                            <node concept="37vLTw" id="tIwzd2cL0N" role="I$8f6">
-                              <ref role="3cqZAo" node="tIwzd2cL0o" resolve="path" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="tIwzd2cL0O" role="3cqZAp">
-                      <node concept="2OqwBi" id="tIwzd2cL0P" role="3clFbG">
-                        <node concept="37vLTw" id="tIwzd2cL0Q" role="2Oq$k0">
-                          <ref role="3cqZAo" node="tIwzd2cL0H" resolve="list" />
-                        </node>
-                        <node concept="TSZUe" id="tIwzd2cL0R" role="2OqNvi">
-                          <node concept="37vLTw" id="tIwzd2cL0S" role="25WWJ7">
-                            <ref role="3cqZAo" node="tIwzd2cL12" resolve="ii" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="tIwzd2cL0T" role="3cqZAp">
-                      <node concept="2OqwBi" id="tIwzd2cL0U" role="3clFbG">
-                        <node concept="37vLTw" id="tIwzd2cL0V" role="2Oq$k0">
-                          <ref role="3cqZAo" node="tIwzd2cKZQ" resolve="queue" />
-                        </node>
-                        <node concept="2Ke9KJ" id="tIwzd2cL0W" role="2OqNvi">
-                          <node concept="1Ls8ON" id="tIwzd2cL0X" role="25WWJ7">
-                            <node concept="2OqwBi" id="tIwzd2cL0Y" role="1Lso8e">
-                              <node concept="37vLTw" id="tIwzd2cL0Z" role="2Oq$k0">
-                                <ref role="3cqZAo" node="tIwzd2cL12" resolve="ii" />
-                              </node>
-                              <node concept="3TrEf2" id="tIwzd2cL10" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="tIwzd2cL11" role="1Lso8e">
-                              <ref role="3cqZAo" node="tIwzd2cL0H" resolve="list" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWsn" id="tIwzd2cL12" role="1Duv9x">
-                    <property role="TrG5h" value="ii" />
-                    <node concept="3Tqbb2" id="tIwzd2cL13" role="1tU5fm">
-                      <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="tIwzd2cL14" role="1DdaDG">
-                    <node concept="1PxgMI" id="tIwzd2cL15" role="2Oq$k0">
-                      <ref role="1PxNhF" to="tpee:fz12cDA" resolve="ClassConcept" />
-                      <node concept="37vLTw" id="tIwzd2cL16" role="1PxMeX">
-                        <ref role="3cqZAo" node="tIwzd2cL0i" resolve="n" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="tIwzd2cL17" role="2OqNvi">
-                      <ref role="3TtcxE" to="tpee:fWEKbgp" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="tIwzd2cL18" role="3cqZAp" />
-                <node concept="3cpWs8" id="tIwzd2cL19" role="3cqZAp">
-                  <node concept="3cpWsn" id="tIwzd2cL1a" role="3cpWs9">
-                    <property role="TrG5h" value="sc" />
-                    <node concept="3Tqbb2" id="tIwzd2cL1b" role="1tU5fm">
-                      <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                    </node>
-                    <node concept="2OqwBi" id="tIwzd2cL1c" role="33vP2m">
-                      <node concept="1PxgMI" id="tIwzd2cL1d" role="2Oq$k0">
-                        <ref role="1PxNhF" to="tpee:fz12cDA" resolve="ClassConcept" />
-                        <node concept="37vLTw" id="tIwzd2cL1e" role="1PxMeX">
-                          <ref role="3cqZAo" node="tIwzd2cL0i" resolve="n" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="tIwzd2cL1f" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tpee:gXzkM_H" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="tIwzd2cL1g" role="3cqZAp">
-                  <node concept="3clFbS" id="tIwzd2cL1h" role="3clFbx">
-                    <node concept="3cpWs8" id="tIwzd2cL1i" role="3cqZAp">
-                      <node concept="3cpWsn" id="tIwzd2cL1j" role="3cpWs9">
-                        <property role="TrG5h" value="list" />
-                        <node concept="_YKpA" id="tIwzd2cL1k" role="1tU5fm">
-                          <node concept="3Tqbb2" id="tIwzd2cL1l" role="_ZDj9">
-                            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                          </node>
-                        </node>
-                        <node concept="2ShNRf" id="tIwzd2cL1m" role="33vP2m">
-                          <node concept="Tc6Ow" id="tIwzd2cL1n" role="2ShVmc">
-                            <node concept="3Tqbb2" id="tIwzd2cL1o" role="HW$YZ">
-                              <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                            </node>
-                            <node concept="37vLTw" id="tIwzd2cL1p" role="I$8f6">
-                              <ref role="3cqZAo" node="tIwzd2cL0o" resolve="path" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="tIwzd2cL1q" role="3cqZAp">
-                      <node concept="2OqwBi" id="tIwzd2cL1r" role="3clFbG">
-                        <node concept="37vLTw" id="tIwzd2cL1s" role="2Oq$k0">
-                          <ref role="3cqZAo" node="tIwzd2cL1j" resolve="list" />
-                        </node>
-                        <node concept="TSZUe" id="tIwzd2cL1t" role="2OqNvi">
-                          <node concept="37vLTw" id="tIwzd2cL1u" role="25WWJ7">
-                            <ref role="3cqZAo" node="tIwzd2cL1a" resolve="sc" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="tIwzd2cL1v" role="3cqZAp">
-                      <node concept="2OqwBi" id="tIwzd2cL1w" role="3clFbG">
-                        <node concept="37vLTw" id="tIwzd2cL1x" role="2Oq$k0">
-                          <ref role="3cqZAo" node="tIwzd2cKZQ" resolve="queue" />
-                        </node>
-                        <node concept="2Ke9KJ" id="tIwzd2cL1y" role="2OqNvi">
-                          <node concept="1Ls8ON" id="tIwzd2cL1z" role="25WWJ7">
-                            <node concept="2OqwBi" id="tIwzd2cL1$" role="1Lso8e">
-                              <node concept="37vLTw" id="tIwzd2cL1_" role="2Oq$k0">
-                                <ref role="3cqZAo" node="tIwzd2cL1a" resolve="sc" />
-                              </node>
-                              <node concept="3TrEf2" id="tIwzd2cL1A" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="tIwzd2cL1B" role="1Lso8e">
-                              <ref role="3cqZAo" node="tIwzd2cL1j" resolve="list" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3y3z36" id="tIwzd2cL1C" role="3clFbw">
-                    <node concept="10Nm6u" id="tIwzd2cL1D" role="3uHU7w" />
-                    <node concept="37vLTw" id="tIwzd2cL1E" role="3uHU7B">
-                      <ref role="3cqZAo" node="tIwzd2cL1a" resolve="sc" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbH" id="tIwzd2cL1F" role="3cqZAp" />
-                <node concept="3clFbH" id="tIwzd2cL1G" role="3cqZAp" />
-              </node>
-              <node concept="2OqwBi" id="tIwzd2cL1H" role="3clFbw">
-                <node concept="37vLTw" id="tIwzd2cL1I" role="2Oq$k0">
-                  <ref role="3cqZAo" node="tIwzd2cL0i" resolve="n" />
-                </node>
-                <node concept="1mIQ4w" id="tIwzd2cL1J" role="2OqNvi">
-                  <node concept="chp4Y" id="tIwzd2cL1K" role="cj9EA">
-                    <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3eNFk2" id="tIwzd2cL1L" role="3eNLev">
-                <node concept="2OqwBi" id="tIwzd2cL1M" role="3eO9$A">
-                  <node concept="37vLTw" id="tIwzd2cL1N" role="2Oq$k0">
-                    <ref role="3cqZAo" node="tIwzd2cL0i" resolve="n" />
-                  </node>
-                  <node concept="1mIQ4w" id="tIwzd2cL1O" role="2OqNvi">
-                    <node concept="chp4Y" id="tIwzd2cL1P" role="cj9EA">
-                      <ref role="cht4Q" to="tpee:g7HP654" resolve="Interface" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbS" id="tIwzd2cL1Q" role="3eOfB_">
-                  <node concept="1DcWWT" id="tIwzd2cL1R" role="3cqZAp">
-                    <node concept="3clFbS" id="tIwzd2cL1S" role="2LFqv$">
-                      <node concept="3cpWs8" id="tIwzd2cL1T" role="3cqZAp">
-                        <node concept="3cpWsn" id="tIwzd2cL1U" role="3cpWs9">
-                          <property role="TrG5h" value="list" />
-                          <node concept="_YKpA" id="tIwzd2cL1V" role="1tU5fm">
-                            <node concept="3Tqbb2" id="tIwzd2cL1W" role="_ZDj9">
-                              <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                            </node>
-                          </node>
-                          <node concept="2ShNRf" id="tIwzd2cL1X" role="33vP2m">
-                            <node concept="Tc6Ow" id="tIwzd2cL1Y" role="2ShVmc">
-                              <node concept="3Tqbb2" id="tIwzd2cL1Z" role="HW$YZ">
-                                <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                              </node>
-                              <node concept="37vLTw" id="tIwzd2cL20" role="I$8f6">
-                                <ref role="3cqZAo" node="tIwzd2cL0o" resolve="path" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="tIwzd2cL21" role="3cqZAp">
-                        <node concept="2OqwBi" id="tIwzd2cL22" role="3clFbG">
-                          <node concept="37vLTw" id="tIwzd2cL23" role="2Oq$k0">
-                            <ref role="3cqZAo" node="tIwzd2cL1U" resolve="list" />
-                          </node>
-                          <node concept="TSZUe" id="tIwzd2cL24" role="2OqNvi">
-                            <node concept="37vLTw" id="tIwzd2cL25" role="25WWJ7">
-                              <ref role="3cqZAo" node="tIwzd2cL2f" resolve="ei" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="tIwzd2cL26" role="3cqZAp">
-                        <node concept="2OqwBi" id="tIwzd2cL27" role="3clFbG">
-                          <node concept="37vLTw" id="tIwzd2cL28" role="2Oq$k0">
-                            <ref role="3cqZAo" node="tIwzd2cKZQ" resolve="queue" />
-                          </node>
-                          <node concept="2Ke9KJ" id="tIwzd2cL29" role="2OqNvi">
-                            <node concept="1Ls8ON" id="tIwzd2cL2a" role="25WWJ7">
-                              <node concept="2OqwBi" id="tIwzd2cL2b" role="1Lso8e">
-                                <node concept="37vLTw" id="tIwzd2cL2c" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="tIwzd2cL2f" resolve="ei" />
-                                </node>
-                                <node concept="3TrEf2" id="tIwzd2cL2d" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:g7uigIF" />
-                                </node>
-                              </node>
-                              <node concept="37vLTw" id="tIwzd2cL2e" role="1Lso8e">
-                                <ref role="3cqZAo" node="tIwzd2cL1U" resolve="list" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWsn" id="tIwzd2cL2f" role="1Duv9x">
-                      <property role="TrG5h" value="ei" />
-                      <node concept="3Tqbb2" id="tIwzd2cL2g" role="1tU5fm">
+            <node concept="1DcWWT" id="2shrukTx00H" role="3cqZAp">
+              <node concept="3clFbS" id="2shrukTx00J" role="2LFqv$">
+                <node concept="3cpWs8" id="2shrukTx1iL" role="3cqZAp">
+                  <node concept="3cpWsn" id="2shrukTx1iM" role="3cpWs9">
+                    <property role="TrG5h" value="list" />
+                    <node concept="_YKpA" id="2shrukTx1iN" role="1tU5fm">
+                      <node concept="3Tqbb2" id="2shrukTx1iO" role="_ZDj9">
                         <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="tIwzd2cL2h" role="1DdaDG">
-                      <node concept="1PxgMI" id="tIwzd2cL2i" role="2Oq$k0">
-                        <ref role="1PxNhF" to="tpee:g7HP654" resolve="Interface" />
-                        <node concept="37vLTw" id="tIwzd2cL2j" role="1PxMeX">
-                          <ref role="3cqZAo" node="tIwzd2cL0i" resolve="n" />
+                    <node concept="2ShNRf" id="2shrukTx1iP" role="33vP2m">
+                      <node concept="Tc6Ow" id="2shrukTx1iQ" role="2ShVmc">
+                        <node concept="3Tqbb2" id="2shrukTx1iR" role="HW$YZ">
+                          <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                        </node>
+                        <node concept="37vLTw" id="2shrukTx1iS" role="I$8f6">
+                          <ref role="3cqZAo" node="tIwzd2cL0o" resolve="path" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2shrukTx1Pw" role="3cqZAp">
+                  <node concept="2OqwBi" id="2shrukTx1Px" role="3clFbG">
+                    <node concept="37vLTw" id="2shrukTx1Py" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2shrukTx1iM" resolve="list" />
+                    </node>
+                    <node concept="TSZUe" id="2shrukTx1Pz" role="2OqNvi">
+                      <node concept="37vLTw" id="2shrukTx1Z3" role="25WWJ7">
+                        <ref role="3cqZAo" node="2shrukTx00K" resolve="direct" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2shrukTx2ug" role="3cqZAp">
+                  <node concept="2OqwBi" id="2shrukTx2Ty" role="3clFbG">
+                    <node concept="37vLTw" id="2shrukTx2ue" role="2Oq$k0">
+                      <ref role="3cqZAo" node="tIwzd2cKZQ" resolve="queue" />
+                    </node>
+                    <node concept="2Ke9KJ" id="2shrukTx3GV" role="2OqNvi">
+                      <node concept="1Ls8ON" id="2shrukTx3Rv" role="25WWJ7">
+                        <node concept="2OqwBi" id="2shrukTx3Rw" role="1Lso8e">
+                          <node concept="37vLTw" id="2shrukTx4bj" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2shrukTx00K" resolve="direct" />
+                          </node>
+                          <node concept="3TrEf2" id="2shrukTx3Ry" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:g7uigIF" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="2shrukTx3Rz" role="1Lso8e">
+                          <ref role="3cqZAo" node="2shrukTx1iM" resolve="list" />
                         </node>
-                      </node>
-                      <node concept="3Tsc0h" id="tIwzd2cL2k" role="2OqNvi">
-                        <ref role="3TtcxE" to="tpee:g7HQHFn" />
                       </node>
                     </node>
                   </node>
-                  <node concept="3clFbH" id="tIwzd2cL2l" role="3cqZAp" />
                 </node>
               </node>
-              <node concept="9aQIb" id="tIwzd2cL2m" role="9aQIa">
-                <node concept="3clFbS" id="tIwzd2cL2n" role="9aQI4">
-                  <node concept="YS8fn" id="tIwzd2cL2o" role="3cqZAp">
-                    <node concept="2ShNRf" id="tIwzd2cL2p" role="YScLw">
-                      <node concept="1pGfFk" id="tIwzd2cL2q" role="2ShVmc">
-                        <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                        <node concept="3cpWs3" id="tIwzd2cL2r" role="37wK5m">
-                          <node concept="Xl_RD" id="tIwzd2cL2s" role="3uHU7B">
-                            <property role="Xl_RC" value="unexpected instance: " />
-                          </node>
-                          <node concept="37vLTw" id="tIwzd2cL2t" role="3uHU7w">
-                            <ref role="3cqZAo" node="tIwzd2cL0i" resolve="n" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
+              <node concept="3cpWsn" id="2shrukTx00K" role="1Duv9x">
+                <property role="TrG5h" value="direct" />
+                <node concept="3Tqbb2" id="2shrukTx0aO" role="1tU5fm">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
+              </node>
+              <node concept="2YIFZM" id="3g$8GQCqfHD" role="1DdaDG">
+                <ref role="37wK5l" node="3g$8GQCqfHz" resolve="directSuper" />
+                <ref role="1Pybhc" node="tIwzd2cJHD" resolve="SubclassingUtil" />
+                <node concept="37vLTw" id="3g$8GQCqfHA" role="37wK5m">
+                  <ref role="3cqZAo" node="tIwzd2cL0i" resolve="top" />
                 </node>
               </node>
             </node>
@@ -9143,8 +8953,10 @@
         </node>
       </node>
       <node concept="A3Dl8" id="tIwzd2cUnY" role="3clF45">
-        <node concept="2I9FWS" id="tIwzd2cKR6" role="A3Ik2">
-          <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+        <node concept="_YKpA" id="2shrukTziKh" role="A3Ik2">
+          <node concept="3Tqbb2" id="2shrukTziVC" role="_ZDj9">
+            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+          </node>
         </node>
       </node>
       <node concept="P$JXv" id="tIwzd2d3k6" role="lGtFl">
@@ -9160,7 +8972,7 @@
         </node>
         <node concept="TZ5HA" id="tIwzd2d77A" role="TZ5H$">
           <node concept="1dT_AC" id="tIwzd2d77B" role="1dT_Ay">
-            <property role="1dT_AB" value="First element in the list will be the immediate supertype of the parameter." />
+            <property role="1dT_AB" value="First element in every list will be the immediate supertype of the parameter." />
           </node>
         </node>
         <node concept="TZ5HA" id="tIwzd2d78e" role="TZ5H$">
@@ -9195,6 +9007,195 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="2shrukTxity" role="jymVt" />
+    <node concept="2YIFZL" id="3g$8GQCqfHz" role="jymVt">
+      <property role="TrG5h" value="directSuper" />
+      <node concept="3Tm1VV" id="2shrukTxi1u" role="1B3o_S" />
+      <node concept="37vLTG" id="3g$8GQCqfHc" role="3clF46">
+        <property role="TrG5h" value="n" />
+        <node concept="3Tqbb2" id="3g$8GQCqfHd" role="1tU5fm">
+          <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="3g$8GQCqfFl" role="3clF47">
+        <node concept="3cpWs8" id="3NRKQ2BGs8I" role="3cqZAp">
+          <node concept="3cpWsn" id="3NRKQ2BGs8J" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="_YKpA" id="3NRKQ2BGs8E" role="1tU5fm">
+              <node concept="3Tqbb2" id="3NRKQ2BGs8H" role="_ZDj9">
+                <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+              </node>
+            </node>
+            <node concept="2ShNRf" id="3NRKQ2BGs8K" role="33vP2m">
+              <node concept="Tc6Ow" id="3NRKQ2BGs8L" role="2ShVmc">
+                <node concept="3Tqbb2" id="3NRKQ2BH14F" role="HW$YZ">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3NRKQ2BGBdB" role="3cqZAp">
+          <node concept="3clFbS" id="3NRKQ2BGBdD" role="3clFbx">
+            <node concept="3clFbJ" id="3NRKQ2BHsC6" role="3cqZAp">
+              <node concept="3clFbS" id="3NRKQ2BHsC8" role="3clFbx">
+                <node concept="3clFbF" id="3NRKQ2BGyd8" role="3cqZAp">
+                  <node concept="2OqwBi" id="3NRKQ2BGySH" role="3clFbG">
+                    <node concept="37vLTw" id="3NRKQ2BGyd6" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3NRKQ2BGs8J" resolve="result" />
+                    </node>
+                    <node concept="TSZUe" id="3NRKQ2BG$k8" role="2OqNvi">
+                      <node concept="2OqwBi" id="3NRKQ2BGH6u" role="25WWJ7">
+                        <node concept="1PxgMI" id="3NRKQ2BGGte" role="2Oq$k0">
+                          <ref role="1PxNhF" to="tpee:fz12cDA" resolve="ClassConcept" />
+                          <node concept="37vLTw" id="2shrukTy8C1" role="1PxMeX">
+                            <ref role="3cqZAo" node="3g$8GQCqfHc" resolve="n" />
+                          </node>
+                        </node>
+                        <node concept="2qgKlT" id="3NRKQ2BH3Z4" role="2OqNvi">
+                          <ref role="37wK5l" to="tpek:i3H_lLu" resolve="getSuperclass" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="2OqwBi" id="3NRKQ2BHsZF" role="3clFbw">
+                <node concept="2OqwBi" id="3NRKQ2BHsQR" role="2Oq$k0">
+                  <node concept="1PxgMI" id="3NRKQ2BHsQS" role="2Oq$k0">
+                    <ref role="1PxNhF" to="tpee:fz12cDA" resolve="ClassConcept" />
+                    <node concept="37vLTw" id="2shrukTy8$P" role="1PxMeX">
+                      <ref role="3cqZAo" node="3g$8GQCqfHc" resolve="n" />
+                    </node>
+                  </node>
+                  <node concept="2qgKlT" id="3NRKQ2BHsQU" role="2OqNvi">
+                    <ref role="37wK5l" to="tpek:i3H_lLu" resolve="getSuperclass" />
+                  </node>
+                </node>
+                <node concept="3x8VRR" id="3NRKQ2BHtHM" role="2OqNvi" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="7yvZ58OX0mW" role="3cqZAp">
+              <node concept="2OqwBi" id="3NRKQ2BGplc" role="3clFbG">
+                <node concept="37vLTw" id="3NRKQ2BGs8Q" role="2Oq$k0">
+                  <ref role="3cqZAo" node="3NRKQ2BGs8J" resolve="result" />
+                </node>
+                <node concept="X8dFx" id="3NRKQ2BG$x2" role="2OqNvi">
+                  <node concept="2OqwBi" id="3NRKQ2BGJTH" role="25WWJ7">
+                    <node concept="1PxgMI" id="3NRKQ2BGJ71" role="2Oq$k0">
+                      <ref role="1PxNhF" to="tpee:fz12cDA" resolve="ClassConcept" />
+                      <node concept="37vLTw" id="2shrukTy8FW" role="1PxMeX">
+                        <ref role="3cqZAo" node="3g$8GQCqfHc" resolve="n" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="3NRKQ2BGKIf" role="2OqNvi">
+                      <ref role="3TtcxE" to="tpee:fWEKbgp" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="3NRKQ2BGEz6" role="3clFbw">
+            <node concept="37vLTw" id="2shrukTy8vn" role="2Oq$k0">
+              <ref role="3cqZAo" node="3g$8GQCqfHc" resolve="n" />
+            </node>
+            <node concept="1mIQ4w" id="3NRKQ2BGFai" role="2OqNvi">
+              <node concept="chp4Y" id="3NRKQ2BGFcC" role="cj9EA">
+                <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
+              </node>
+            </node>
+          </node>
+          <node concept="3eNFk2" id="3NRKQ2BGL3I" role="3eNLev">
+            <node concept="3clFbS" id="3NRKQ2BGL3K" role="3eOfB_">
+              <node concept="3clFbF" id="3NRKQ2BGLLh" role="3cqZAp">
+                <node concept="2OqwBi" id="3NRKQ2BGLLi" role="3clFbG">
+                  <node concept="37vLTw" id="3NRKQ2BGLLj" role="2Oq$k0">
+                    <ref role="3cqZAo" node="3NRKQ2BGs8J" resolve="result" />
+                  </node>
+                  <node concept="X8dFx" id="3NRKQ2BGLLk" role="2OqNvi">
+                    <node concept="2OqwBi" id="3NRKQ2BGU11" role="25WWJ7">
+                      <node concept="1PxgMI" id="3NRKQ2BGU12" role="2Oq$k0">
+                        <ref role="1PxNhF" to="tpee:g7HP654" resolve="Interface" />
+                        <node concept="37vLTw" id="2shrukTy8OH" role="1PxMeX">
+                          <ref role="3cqZAo" node="3g$8GQCqfHc" resolve="n" />
+                        </node>
+                      </node>
+                      <node concept="3Tsc0h" id="3NRKQ2BGU14" role="2OqNvi">
+                        <ref role="3TtcxE" to="tpee:g7HQHFn" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbJ" id="3NRKQ2BGSWh" role="3cqZAp">
+                <node concept="3clFbS" id="3NRKQ2BGSWj" role="3clFbx">
+                  <node concept="3clFbF" id="3NRKQ2BGYj2" role="3cqZAp">
+                    <node concept="2OqwBi" id="3NRKQ2BGY_W" role="3clFbG">
+                      <node concept="37vLTw" id="3NRKQ2BGYj0" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3NRKQ2BGs8J" resolve="result" />
+                      </node>
+                      <node concept="TSZUe" id="3NRKQ2BH02F" role="2OqNvi">
+                        <node concept="2c44tf" id="3NRKQ2BH2FN" role="25WWJ7">
+                          <node concept="3uibUv" id="3NRKQ2BH2IT" role="2c44tc">
+                            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="2OqwBi" id="3NRKQ2BGVYr" role="3clFbw">
+                  <node concept="2OqwBi" id="3NRKQ2BGNKj" role="2Oq$k0">
+                    <node concept="1PxgMI" id="3NRKQ2BGLLm" role="2Oq$k0">
+                      <ref role="1PxNhF" to="tpee:g7HP654" resolve="Interface" />
+                      <node concept="37vLTw" id="2shrukTy8Zh" role="1PxMeX">
+                        <ref role="3cqZAo" node="3g$8GQCqfHc" resolve="n" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="3NRKQ2BGOEm" role="2OqNvi">
+                      <ref role="3TtcxE" to="tpee:g7HQHFn" />
+                    </node>
+                  </node>
+                  <node concept="1v1jN8" id="3NRKQ2BGYi9" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+            <node concept="2OqwBi" id="3NRKQ2BGLoE" role="3eO9$A">
+              <node concept="37vLTw" id="2shrukTy8KR" role="2Oq$k0">
+                <ref role="3cqZAo" node="3g$8GQCqfHc" resolve="n" />
+              </node>
+              <node concept="1mIQ4w" id="3NRKQ2BGLoG" role="2OqNvi">
+                <node concept="chp4Y" id="3NRKQ2BGLt2" role="cj9EA">
+                  <ref role="cht4Q" to="tpee:g7HP654" resolve="Interface" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="9aQIb" id="3NRKQ2BGP6b" role="9aQIa">
+            <node concept="3clFbS" id="3NRKQ2BGP6c" role="9aQI4">
+              <node concept="YS8fn" id="3NRKQ2BGPwt" role="3cqZAp">
+                <node concept="2ShNRf" id="3NRKQ2BGPwD" role="YScLw">
+                  <node concept="1pGfFk" id="3NRKQ2BGPNl" role="2ShVmc">
+                    <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="3NRKQ2BGQd7" role="3cqZAp">
+          <node concept="37vLTw" id="3NRKQ2BGQV5" role="3cqZAk">
+            <ref role="3cqZAo" node="3NRKQ2BGs8J" resolve="result" />
+          </node>
+        </node>
+      </node>
+      <node concept="A3Dl8" id="2shrukTwZIC" role="3clF45">
+        <node concept="3Tqbb2" id="2shrukTwMv0" role="A3Ik2">
+          <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="5H6hZahiBZW" role="jymVt" />
     <node concept="2YIFZL" id="5H6hZahiCgu" role="jymVt">
       <property role="IEkAT" value="false" />
@@ -9212,25 +9213,23 @@
           <node concept="3cpWsn" id="5H6hZahiD8g" role="3cpWs9">
             <property role="TrG5h" value="result" />
             <node concept="_YKpA" id="5H6hZahiD8h" role="1tU5fm">
-              <node concept="2I9FWS" id="5H6hZahiD8i" role="_ZDj9">
-                <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+              <node concept="_YKpA" id="2shrukTzDml" role="_ZDj9">
+                <node concept="3Tqbb2" id="2shrukTzDmm" role="_ZDj9">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
               </node>
             </node>
             <node concept="2ShNRf" id="5H6hZahiD8j" role="33vP2m">
               <node concept="Tc6Ow" id="5H6hZahiD8k" role="2ShVmc">
-                <node concept="2I9FWS" id="5H6hZahiD8l" role="HW$YZ">
-                  <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+                <node concept="_YKpA" id="2shrukTzDv4" role="HW$YZ">
+                  <node concept="3Tqbb2" id="2shrukTzDv5" role="_ZDj9">
+                    <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="6infEALz1$B" role="3cqZAp" />
-        <node concept="3SKdUt" id="6infEALzRjF" role="3cqZAp">
-          <node concept="3SKdUq" id="6infEALzUgw" role="3SKWNk">
-            <property role="3SKdUp" value="TODO: creating a node &quot;in-the-air&quot;" />
-          </node>
-        </node>
         <node concept="3cpWs8" id="7t5VLKGEojH" role="3cqZAp">
           <node concept="3cpWsn" id="7t5VLKGEojI" role="3cpWs9">
             <property role="TrG5h" value="queue" />
@@ -9239,8 +9238,10 @@
                 <node concept="3Tqbb2" id="7t5VLKGEojL" role="1Lm7xW">
                   <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
                 </node>
-                <node concept="2I9FWS" id="7t5VLKGEojM" role="1Lm7xW">
-                  <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+                <node concept="_YKpA" id="2shrukTzI2I" role="1Lm7xW">
+                  <node concept="3Tqbb2" id="2shrukTzI2J" role="_ZDj9">
+                    <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -9250,8 +9251,10 @@
                   <node concept="3Tqbb2" id="7t5VLKGEojQ" role="1Lm7xW">
                     <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
                   </node>
-                  <node concept="2I9FWS" id="7t5VLKGEojR" role="1Lm7xW">
-                    <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  <node concept="_YKpA" id="2shrukTzLll" role="1Lm7xW">
+                    <node concept="3Tqbb2" id="2shrukTzLlm" role="_ZDj9">
+                      <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                    </node>
                   </node>
                 </node>
                 <node concept="1Ls8ON" id="7t5VLKGEojS" role="HW$Y0">
@@ -9295,8 +9298,10 @@
                   <node concept="3Tqbb2" id="7t5VLKGEOT5" role="1Lm7xW">
                     <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
                   </node>
-                  <node concept="2I9FWS" id="7t5VLKGEOT6" role="1Lm7xW">
-                    <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  <node concept="_YKpA" id="2shrukTzOx9" role="1Lm7xW">
+                    <node concept="3Tqbb2" id="2shrukTzOxa" role="_ZDj9">
+                      <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                    </node>
                   </node>
                 </node>
                 <node concept="2OqwBi" id="7t5VLKGEOT7" role="33vP2m">
@@ -9327,9 +9332,6 @@
             <node concept="3cpWs8" id="5H6hZahiRsC" role="3cqZAp">
               <node concept="3cpWsn" id="5H6hZahiRsD" role="3cpWs9">
                 <property role="TrG5h" value="path" />
-                <node concept="2I9FWS" id="5H6hZahiRsB" role="1tU5fm">
-                  <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
-                </node>
                 <node concept="1LFfDK" id="7t5VLKGEP7R" role="33vP2m">
                   <node concept="3cmrfG" id="7t5VLKGEP7S" role="1LF_Uc">
                     <property role="3cmrfH" value="1" />
@@ -9338,370 +9340,34 @@
                     <ref role="3cqZAo" node="7t5VLKGEOT3" resolve="pair" />
                   </node>
                 </node>
+                <node concept="_YKpA" id="2shrukTzRko" role="1tU5fm">
+                  <node concept="3Tqbb2" id="2shrukTzRkp" role="_ZDj9">
+                    <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                  </node>
+                </node>
               </node>
             </node>
             <node concept="3clFbH" id="5H6hZahj9ND" role="3cqZAp" />
-            <node concept="3cpWs8" id="5H6hZahjDnP" role="3cqZAp">
-              <node concept="3cpWsn" id="5H6hZahjDnS" role="3cpWs9">
-                <property role="TrG5h" value="reachedRoot" />
-                <node concept="10P_77" id="5H6hZahjDnN" role="1tU5fm" />
-                <node concept="3clFbT" id="5H6hZahjDrW" role="33vP2m">
-                  <property role="3clFbU" value="true" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbJ" id="5H6hZahj1Sl" role="3cqZAp">
-              <node concept="3clFbS" id="5H6hZahj1Sn" role="3clFbx">
-                <node concept="3clFbH" id="5H6hZahjDsk" role="3cqZAp" />
-                <node concept="1DcWWT" id="5H6hZahjdyq" role="3cqZAp">
-                  <node concept="3clFbS" id="5H6hZahjdys" role="2LFqv$">
-                    <node concept="3cpWs8" id="5H6hZahjkLB" role="3cqZAp">
-                      <node concept="3cpWsn" id="5H6hZahjkLC" role="3cpWs9">
-                        <property role="TrG5h" value="newPath" />
-                        <node concept="_YKpA" id="5H6hZahjSWr" role="1tU5fm">
-                          <node concept="3Tqbb2" id="5H6hZahjSWt" role="_ZDj9">
-                            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                          </node>
-                        </node>
-                        <node concept="2ShNRf" id="5H6hZahjkLD" role="33vP2m">
-                          <node concept="Tc6Ow" id="5H6hZahjRzT" role="2ShVmc">
-                            <node concept="3Tqbb2" id="5H6hZahjRzV" role="HW$YZ">
-                              <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                            </node>
-                            <node concept="37vLTw" id="5H6hZahjRzW" role="I$8f6">
-                              <ref role="3cqZAo" node="5H6hZahiRsD" resolve="path" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="5H6hZahjhKm" role="3cqZAp">
-                      <node concept="2OqwBi" id="5H6hZahjoBC" role="3clFbG">
-                        <node concept="37vLTw" id="5H6hZahjkLH" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5H6hZahjkLC" resolve="newPath" />
-                        </node>
-                        <node concept="TSZUe" id="5H6hZahjUul" role="2OqNvi">
-                          <node concept="37vLTw" id="5H6hZahjUuo" role="25WWJ7">
-                            <ref role="3cqZAo" node="5H6hZahjdyu" resolve="impl" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="5H6hZahj$GT" role="3cqZAp">
-                      <node concept="2OqwBi" id="5H6hZahj$Xm" role="3clFbG">
-                        <node concept="37vLTw" id="5H6hZahj$GR" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7t5VLKGEojI" resolve="queue" />
-                        </node>
-                        <node concept="2Ke9KJ" id="5H6hZahjASH" role="2OqNvi">
-                          <node concept="1Ls8ON" id="7t5VLKGF4G0" role="25WWJ7">
-                            <node concept="2OqwBi" id="7t5VLKGF5jt" role="1Lso8e">
-                              <node concept="37vLTw" id="7t5VLKGF59x" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5H6hZahjdyu" resolve="impl" />
-                              </node>
-                              <node concept="3TrEf2" id="7t5VLKGF6ml" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="7t5VLKGF4XW" role="1Lso8e">
-                              <ref role="3cqZAo" node="5H6hZahjkLC" resolve="newPath" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="5H6hZahjD$f" role="3cqZAp">
-                      <node concept="37vLTI" id="5H6hZahjDIr" role="3clFbG">
-                        <node concept="3clFbT" id="5H6hZahjDJ7" role="37vLTx">
-                          <property role="3clFbU" value="false" />
-                        </node>
-                        <node concept="37vLTw" id="5H6hZahjD$d" role="37vLTJ">
-                          <ref role="3cqZAo" node="5H6hZahjDnS" resolve="reachedRoot" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3cpWsn" id="5H6hZahjdyu" role="1Duv9x">
-                    <property role="TrG5h" value="impl" />
-                    <node concept="3Tqbb2" id="5H6hZahjeu_" role="1tU5fm">
-                      <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                    </node>
-                  </node>
-                  <node concept="2OqwBi" id="5H6hZahjdyz" role="1DdaDG">
-                    <node concept="1PxgMI" id="5H6hZahjdy$" role="2Oq$k0">
-                      <ref role="1PxNhF" to="tpee:fz12cDA" resolve="ClassConcept" />
-                      <node concept="37vLTw" id="5H6hZahjdy_" role="1PxMeX">
-                        <ref role="3cqZAo" node="5H6hZahj1Ln" resolve="top" />
-                      </node>
-                    </node>
-                    <node concept="3Tsc0h" id="5H6hZahjdyA" role="2OqNvi">
-                      <ref role="3TtcxE" to="tpee:fWEKbgp" />
-                    </node>
+            <node concept="3cpWs8" id="2shrukTzZ22" role="3cqZAp">
+              <node concept="3cpWsn" id="2shrukTzZ23" role="3cpWs9">
+                <property role="TrG5h" value="directSuper" />
+                <node concept="A3Dl8" id="2shrukTzZ1W" role="1tU5fm">
+                  <node concept="3Tqbb2" id="2shrukTzZ1Z" role="A3Ik2">
+                    <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
                   </node>
                 </node>
-                <node concept="3clFbH" id="5H6hZahjbEQ" role="3cqZAp" />
-                <node concept="3cpWs8" id="5H6hZahjD1X" role="3cqZAp">
-                  <node concept="3cpWsn" id="5H6hZahjD1Y" role="3cpWs9">
-                    <property role="TrG5h" value="sup" />
-                    <node concept="3Tqbb2" id="5H6hZahjD1v" role="1tU5fm">
-                      <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                    </node>
-                    <node concept="2OqwBi" id="5H6hZahjD1Z" role="33vP2m">
-                      <node concept="1PxgMI" id="5H6hZahjD20" role="2Oq$k0">
-                        <ref role="1PxNhF" to="tpee:fz12cDA" resolve="ClassConcept" />
-                        <node concept="37vLTw" id="5H6hZahjD21" role="1PxMeX">
-                          <ref role="3cqZAo" node="5H6hZahj1Ln" resolve="top" />
-                        </node>
-                      </node>
-                      <node concept="3TrEf2" id="5H6hZahjD22" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tpee:gXzkM_H" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbJ" id="5H6hZahjDbg" role="3cqZAp">
-                  <node concept="3clFbS" id="5H6hZahjDbi" role="3clFbx">
-                    <node concept="3cpWs8" id="5H6hZahjFJS" role="3cqZAp">
-                      <node concept="3cpWsn" id="5H6hZahjFJT" role="3cpWs9">
-                        <property role="TrG5h" value="newPath" />
-                        <node concept="_YKpA" id="5H6hZahjUDg" role="1tU5fm">
-                          <node concept="3Tqbb2" id="5H6hZahjUDi" role="_ZDj9">
-                            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                          </node>
-                        </node>
-                        <node concept="2ShNRf" id="5H6hZahjFJW" role="33vP2m">
-                          <node concept="Tc6Ow" id="5H6hZahjVf_" role="2ShVmc">
-                            <node concept="3Tqbb2" id="5H6hZahjVfB" role="HW$YZ">
-                              <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                            </node>
-                            <node concept="37vLTw" id="5H6hZahjVfC" role="I$8f6">
-                              <ref role="3cqZAo" node="5H6hZahiRsD" resolve="path" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="5H6hZahjFK0" role="3cqZAp">
-                      <node concept="2OqwBi" id="5H6hZahjFK1" role="3clFbG">
-                        <node concept="37vLTw" id="5H6hZahjFK2" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5H6hZahjFJT" resolve="newPath" />
-                        </node>
-                        <node concept="TSZUe" id="5H6hZahk0_i" role="2OqNvi">
-                          <node concept="37vLTw" id="5H6hZahk0_l" role="25WWJ7">
-                            <ref role="3cqZAo" node="5H6hZahjD1Y" resolve="sup" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="5H6hZahjFK7" role="3cqZAp">
-                      <node concept="2OqwBi" id="5H6hZahjFK8" role="3clFbG">
-                        <node concept="37vLTw" id="5H6hZahjFK9" role="2Oq$k0">
-                          <ref role="3cqZAo" node="7t5VLKGEojI" resolve="queue" />
-                        </node>
-                        <node concept="2Ke9KJ" id="5H6hZahjFKa" role="2OqNvi">
-                          <node concept="1Ls8ON" id="7t5VLKGF6Ck" role="25WWJ7">
-                            <node concept="2OqwBi" id="7t5VLKGF6Cl" role="1Lso8e">
-                              <node concept="37vLTw" id="7t5VLKGFc97" role="2Oq$k0">
-                                <ref role="3cqZAo" node="5H6hZahjD1Y" resolve="sup" />
-                              </node>
-                              <node concept="3TrEf2" id="7t5VLKGF6Cn" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:g7uigIF" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="7t5VLKGF6Co" role="1Lso8e">
-                              <ref role="3cqZAo" node="5H6hZahjFJT" resolve="newPath" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="5H6hZahjFKc" role="3cqZAp">
-                      <node concept="37vLTI" id="5H6hZahjFKd" role="3clFbG">
-                        <node concept="3clFbT" id="5H6hZahjFKe" role="37vLTx">
-                          <property role="3clFbU" value="false" />
-                        </node>
-                        <node concept="37vLTw" id="5H6hZahjFKf" role="37vLTJ">
-                          <ref role="3cqZAo" node="5H6hZahjDnS" resolve="reachedRoot" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3y3z36" id="5H6hZahjDiK" role="3clFbw">
-                    <node concept="37vLTw" id="5H6hZahjDf6" role="3uHU7B">
-                      <ref role="3cqZAo" node="5H6hZahjD1Y" resolve="sup" />
-                    </node>
-                    <node concept="10Nm6u" id="5H6hZahjDjt" role="3uHU7w" />
-                  </node>
-                </node>
-                <node concept="3clFbH" id="5H6hZahjbEF" role="3cqZAp" />
-              </node>
-              <node concept="2OqwBi" id="5H6hZahj2gv" role="3clFbw">
-                <node concept="37vLTw" id="5H6hZahj29k" role="2Oq$k0">
-                  <ref role="3cqZAo" node="5H6hZahj1Ln" resolve="top" />
-                </node>
-                <node concept="1mIQ4w" id="5H6hZahj9E3" role="2OqNvi">
-                  <node concept="chp4Y" id="5H6hZahj9Eu" role="cj9EA">
-                    <ref role="cht4Q" to="tpee:fz12cDA" resolve="ClassConcept" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3eNFk2" id="5H6hZahj9TF" role="3eNLev">
-                <node concept="2OqwBi" id="5H6hZahja5I" role="3eO9$A">
-                  <node concept="37vLTw" id="5H6hZahj9Yz" role="2Oq$k0">
+                <node concept="2YIFZM" id="2shrukTzZ24" role="33vP2m">
+                  <ref role="1Pybhc" node="tIwzd2cJHD" resolve="SubclassingUtil" />
+                  <ref role="37wK5l" node="3g$8GQCqfHz" resolve="directSuper" />
+                  <node concept="37vLTw" id="2shrukTzZ25" role="37wK5m">
                     <ref role="3cqZAo" node="5H6hZahj1Ln" resolve="top" />
                   </node>
-                  <node concept="1mIQ4w" id="5H6hZahjaV4" role="2OqNvi">
-                    <node concept="chp4Y" id="5H6hZahjaVv" role="cj9EA">
-                      <ref role="cht4Q" to="tpee:g7HP654" resolve="Interface" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3clFbS" id="5H6hZahj9TH" role="3eOfB_">
-                  <node concept="3clFbH" id="5H6hZahk1Ci" role="3cqZAp" />
-                  <node concept="1DcWWT" id="5H6hZahk8Ba" role="3cqZAp">
-                    <node concept="3clFbS" id="5H6hZahk8Bc" role="2LFqv$">
-                      <node concept="3cpWs8" id="5H6hZahkjjx" role="3cqZAp">
-                        <node concept="3cpWsn" id="5H6hZahkjjy" role="3cpWs9">
-                          <property role="TrG5h" value="newPath" />
-                          <node concept="_YKpA" id="5H6hZahkjjz" role="1tU5fm">
-                            <node concept="3Tqbb2" id="5H6hZahkjj$" role="_ZDj9">
-                              <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                            </node>
-                          </node>
-                          <node concept="2ShNRf" id="5H6hZahkjj_" role="33vP2m">
-                            <node concept="Tc6Ow" id="5H6hZahkjjA" role="2ShVmc">
-                              <node concept="3Tqbb2" id="5H6hZahkjjB" role="HW$YZ">
-                                <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                              </node>
-                              <node concept="37vLTw" id="5H6hZahkjjC" role="I$8f6">
-                                <ref role="3cqZAo" node="5H6hZahiRsD" resolve="path" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="5H6hZahkjjD" role="3cqZAp">
-                        <node concept="2OqwBi" id="5H6hZahkjjE" role="3clFbG">
-                          <node concept="37vLTw" id="5H6hZahkjjF" role="2Oq$k0">
-                            <ref role="3cqZAo" node="5H6hZahkjjy" resolve="newPath" />
-                          </node>
-                          <node concept="TSZUe" id="5H6hZahkjjG" role="2OqNvi">
-                            <node concept="37vLTw" id="5H6hZahkkl0" role="25WWJ7">
-                              <ref role="3cqZAo" node="5H6hZahk8Be" resolve="ext" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="5H6hZahkjjK" role="3cqZAp">
-                        <node concept="2OqwBi" id="5H6hZahkjjL" role="3clFbG">
-                          <node concept="37vLTw" id="5H6hZahkjjM" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7t5VLKGEojI" resolve="queue" />
-                          </node>
-                          <node concept="2Ke9KJ" id="5H6hZahkjjN" role="2OqNvi">
-                            <node concept="1Ls8ON" id="7t5VLKGFcgA" role="25WWJ7">
-                              <node concept="2OqwBi" id="7t5VLKGFcgB" role="1Lso8e">
-                                <node concept="37vLTw" id="7t5VLKGOOm8" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5H6hZahk8Be" resolve="ext" />
-                                </node>
-                                <node concept="3TrEf2" id="7t5VLKGFcgD" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:g7uigIF" />
-                                </node>
-                              </node>
-                              <node concept="37vLTw" id="7t5VLKGFcgE" role="1Lso8e">
-                                <ref role="3cqZAo" node="5H6hZahkjjy" resolve="newPath" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="3clFbF" id="5H6hZahkjjP" role="3cqZAp">
-                        <node concept="37vLTI" id="5H6hZahkjjQ" role="3clFbG">
-                          <node concept="3clFbT" id="5H6hZahkjjR" role="37vLTx">
-                            <property role="3clFbU" value="false" />
-                          </node>
-                          <node concept="37vLTw" id="5H6hZahkjjS" role="37vLTJ">
-                            <ref role="3cqZAo" node="5H6hZahjDnS" resolve="reachedRoot" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3cpWsn" id="5H6hZahk8Be" role="1Duv9x">
-                      <property role="TrG5h" value="ext" />
-                      <node concept="3Tqbb2" id="5H6hZahk9zh" role="1tU5fm">
-                        <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
-                      </node>
-                    </node>
-                    <node concept="2OqwBi" id="5H6hZahk8Bj" role="1DdaDG">
-                      <node concept="1PxgMI" id="5H6hZahk8Bk" role="2Oq$k0">
-                        <ref role="1PxNhF" to="tpee:g7HP654" resolve="Interface" />
-                        <node concept="37vLTw" id="5H6hZahk8Bl" role="1PxMeX">
-                          <ref role="3cqZAo" node="5H6hZahj1Ln" resolve="top" />
-                        </node>
-                      </node>
-                      <node concept="3Tsc0h" id="5H6hZahk8Bm" role="2OqNvi">
-                        <ref role="3TtcxE" to="tpee:g7HQHFn" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3clFbH" id="4JRKVCv9Hol" role="3cqZAp" />
-                </node>
-              </node>
-              <node concept="9aQIb" id="5H6hZahjaYY" role="9aQIa">
-                <node concept="3clFbS" id="5H6hZahjaYZ" role="9aQI4">
-                  <node concept="YS8fn" id="5H6hZahjb5U" role="3cqZAp">
-                    <node concept="2ShNRf" id="5H6hZahjb6w" role="YScLw">
-                      <node concept="1pGfFk" id="5H6hZahjbje" role="2ShVmc">
-                        <ref role="37wK5l" to="wyt6:~IllegalStateException.&lt;init&gt;(java.lang.String)" resolve="IllegalStateException" />
-                        <node concept="3cpWs3" id="5H6hZahjbxw" role="37wK5m">
-                          <node concept="37vLTw" id="5H6hZahjbxV" role="3uHU7w">
-                            <ref role="3cqZAo" node="5H6hZahj1Ln" resolve="top" />
-                          </node>
-                          <node concept="Xl_RD" id="5H6hZahjbjW" role="3uHU7B">
-                            <property role="Xl_RC" value="unexpected instance: " />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="5H6hZahj9IU" role="3cqZAp" />
+            <node concept="3clFbH" id="2shrukT$6AJ" role="3cqZAp" />
             <node concept="3clFbJ" id="5H6hZahjMyv" role="3cqZAp">
               <node concept="3clFbS" id="5H6hZahjMyx" role="3clFbx">
-                <node concept="3clFbJ" id="4JRKVCvbNHe" role="3cqZAp">
-                  <node concept="3clFbS" id="4JRKVCvbNHg" role="3clFbx">
-                    <node concept="3clFbF" id="4JRKVCv9HaF" role="3cqZAp">
-                      <node concept="2OqwBi" id="4JRKVCv9HaG" role="3clFbG">
-                        <node concept="37vLTw" id="4JRKVCv9HaH" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5H6hZahiRsD" resolve="path" />
-                        </node>
-                        <node concept="TSZUe" id="4JRKVCv9HaI" role="2OqNvi">
-                          <node concept="2c44tf" id="4JRKVCv9HaJ" role="25WWJ7">
-                            <node concept="3uibUv" id="4JRKVCv9HaK" role="2c44tc">
-                              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3y3z36" id="4JRKVCvbX9A" role="3clFbw">
-                    <node concept="3B5_sB" id="4JRKVCvc0QG" role="3uHU7w">
-                      <ref role="3B5MYn" to="wyt6:~Object" resolve="Object" />
-                    </node>
-                    <node concept="2OqwBi" id="4JRKVCvbZXn" role="3uHU7B">
-                      <node concept="2OqwBi" id="4JRKVCvbOQb" role="2Oq$k0">
-                        <node concept="37vLTw" id="4JRKVCvbNKH" role="2Oq$k0">
-                          <ref role="3cqZAo" node="5H6hZahiRsD" resolve="path" />
-                        </node>
-                        <node concept="1yVyf7" id="4JRKVCvbUlc" role="2OqNvi" />
-                      </node>
-                      <node concept="3TrEf2" id="4JRKVCvc0MQ" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tpee:g7uigIF" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
                 <node concept="3clFbF" id="5H6hZahjMAW" role="3cqZAp">
                   <node concept="2OqwBi" id="5H6hZahjMSe" role="3clFbG">
                     <node concept="37vLTw" id="5H6hZahjMAU" role="2Oq$k0">
@@ -9718,8 +9384,79 @@
                   </node>
                 </node>
               </node>
-              <node concept="37vLTw" id="5H6hZahjM_I" role="3clFbw">
-                <ref role="3cqZAo" node="5H6hZahjDnS" resolve="reachedRoot" />
+              <node concept="2OqwBi" id="2shrukTzZJd" role="3clFbw">
+                <node concept="37vLTw" id="2shrukTzZxv" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2shrukTzZ23" resolve="directSuper" />
+                </node>
+                <node concept="1v1jN8" id="2shrukT$0vB" role="2OqNvi" />
+              </node>
+            </node>
+            <node concept="3clFbH" id="2shrukT$6Kn" role="3cqZAp" />
+            <node concept="1DcWWT" id="2shrukTzW5t" role="3cqZAp">
+              <node concept="3clFbS" id="2shrukTzW5u" role="2LFqv$">
+                <node concept="3cpWs8" id="2shrukTzW5v" role="3cqZAp">
+                  <node concept="3cpWsn" id="2shrukTzW5w" role="3cpWs9">
+                    <property role="TrG5h" value="list" />
+                    <node concept="_YKpA" id="2shrukTzW5x" role="1tU5fm">
+                      <node concept="3Tqbb2" id="2shrukTzW5y" role="_ZDj9">
+                        <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                      </node>
+                    </node>
+                    <node concept="2ShNRf" id="2shrukTzW5z" role="33vP2m">
+                      <node concept="Tc6Ow" id="2shrukTzW5$" role="2ShVmc">
+                        <node concept="3Tqbb2" id="2shrukTzW5_" role="HW$YZ">
+                          <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                        </node>
+                        <node concept="37vLTw" id="2shrukTzW5A" role="I$8f6">
+                          <ref role="3cqZAo" node="5H6hZahiRsD" resolve="path" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2shrukTzW5B" role="3cqZAp">
+                  <node concept="2OqwBi" id="2shrukTzW5C" role="3clFbG">
+                    <node concept="37vLTw" id="2shrukTzW5D" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2shrukTzW5w" resolve="list" />
+                    </node>
+                    <node concept="TSZUe" id="2shrukTzW5E" role="2OqNvi">
+                      <node concept="37vLTw" id="2shrukTzW5F" role="25WWJ7">
+                        <ref role="3cqZAo" node="2shrukTzW5P" resolve="direct" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="2shrukTzW5G" role="3cqZAp">
+                  <node concept="2OqwBi" id="2shrukTzW5H" role="3clFbG">
+                    <node concept="37vLTw" id="2shrukTzW5I" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7t5VLKGEojI" resolve="queue" />
+                    </node>
+                    <node concept="2Ke9KJ" id="2shrukTzW5J" role="2OqNvi">
+                      <node concept="1Ls8ON" id="2shrukTzW5K" role="25WWJ7">
+                        <node concept="2OqwBi" id="2shrukTzW5L" role="1Lso8e">
+                          <node concept="37vLTw" id="2shrukTzW5M" role="2Oq$k0">
+                            <ref role="3cqZAo" node="2shrukTzW5P" resolve="direct" />
+                          </node>
+                          <node concept="3TrEf2" id="2shrukTzW5N" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:g7uigIF" />
+                          </node>
+                        </node>
+                        <node concept="37vLTw" id="2shrukTzW5O" role="1Lso8e">
+                          <ref role="3cqZAo" node="2shrukTzW5w" resolve="list" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3cpWsn" id="2shrukTzW5P" role="1Duv9x">
+                <property role="TrG5h" value="direct" />
+                <node concept="3Tqbb2" id="2shrukTzW5Q" role="1tU5fm">
+                  <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="2shrukTzZ26" role="1DdaDG">
+                <ref role="3cqZAo" node="2shrukTzZ23" resolve="directSuper" />
               </node>
             </node>
           </node>
@@ -9730,18 +9467,12 @@
             <node concept="3GX2aA" id="5H6hZahiH$A" role="2OqNvi" />
           </node>
         </node>
-        <node concept="3clFbH" id="5H6hZahiH$R" role="3cqZAp" />
         <node concept="3clFbF" id="5H6hZahiIjK" role="3cqZAp">
           <node concept="37vLTw" id="5H6hZahiIjI" role="3clFbG">
             <ref role="3cqZAo" node="5H6hZahiD8g" resolve="result" />
           </node>
         </node>
       </node>
-      <node concept="_YKpA" id="5H6hZahiCT$" role="3clF45">
-        <node concept="2I9FWS" id="5H6hZahiICN" role="_ZDj9">
-          <ref role="2I9WkF" to="tpee:g7uibYu" resolve="ClassifierType" />
-        </node>
-      </node>
       <node concept="3Tm1VV" id="5H6hZahiCb$" role="1B3o_S" />
       <node concept="P$JXv" id="5H6hZahiCV3" role="lGtFl">
         <node concept="TZ5HA" id="5H6hZahiCV4" role="TZ5H$">
@@ -9785,6 +9516,13 @@
           </node>
         </node>
       </node>
+      <node concept="_YKpA" id="2shrukTA6kF" role="3clF45">
+        <node concept="_YKpA" id="2shrukTA6kH" role="_ZDj9">
+          <node concept="3Tqbb2" id="2shrukTA6kI" role="_ZDj9">
+            <ref role="ehGHo" to="tpee:g7uibYu" resolve="ClassifierType" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="tIwzd2cJHW" role="jymVt" />
     <node concept="3Tm1VV" id="tIwzd2cJHE" role="1B3o_S" />
diff --git a/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps b/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps
index cd5ba857..91dc679a 100644
--- a/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps
+++ b/languages/jetbrains.mps.lang.typesystem2/template/models/jetbrains/mps/lang/typesystem2/template.mps
@@ -219,7 +219,6 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS" />
       <concept id="1145404486709" name="jetbrains.mps.lang.smodel.structure.SemanticDowncastExpression" flags="nn" index="2JrnkZ">
         <child id="1145404616321" name="leftExpression" index="2JrQYb" />
       </concept>
@@ -986,7 +985,9 @@
       <node concept="37vLTG" id="1e3DfAArnOm" role="3clF46">
         <property role="TrG5h" value="nlists" />
         <node concept="_YKpA" id="1e3DfAArnOn" role="1tU5fm">
-          <node concept="2I9FWS" id="1e3DfAArnOo" role="_ZDj9" />
+          <node concept="_YKpA" id="2shrukT_lYx" role="_ZDj9">
+            <node concept="3Tqbb2" id="2shrukT_ml1" role="_ZDj9" />
+          </node>
         </node>
       </node>
       <node concept="3uibUv" id="1e3DfAArnOp" role="3clF45">
@@ -1054,7 +1055,9 @@
           </node>
           <node concept="3cpWsn" id="1e3DfAArnOR" role="1Duv9x">
             <property role="TrG5h" value="nlist" />
-            <node concept="2I9FWS" id="1e3DfAArnOS" role="1tU5fm" />
+            <node concept="_YKpA" id="2shrukT_mE_" role="1tU5fm">
+              <node concept="3Tqbb2" id="2shrukT_mEA" role="_ZDj9" />
+            </node>
           </node>
           <node concept="37vLTw" id="1e3DfAArnOT" role="1DdaDG">
             <ref role="3cqZAo" node="1e3DfAArnOm" resolve="nlists" />
@@ -1088,7 +1091,9 @@
       <property role="IEkAT" value="false" />
       <node concept="37vLTG" id="1e3DfAArnP4" role="3clF46">
         <property role="TrG5h" value="nlist" />
-        <node concept="2I9FWS" id="1e3DfAArnP5" role="1tU5fm" />
+        <node concept="_YKpA" id="2shrukT_n08" role="1tU5fm">
+          <node concept="3Tqbb2" id="2shrukT_n09" role="_ZDj9" />
+        </node>
       </node>
       <node concept="3uibUv" id="1e3DfAArnP6" role="3clF45">
         <ref role="3uigEE" to="ie8e:1bm7a6EXvsP" resolve="Atom" />
@@ -1190,7 +1195,9 @@
       <node concept="37vLTG" id="2DKqMqOrPnz" role="3clF46">
         <property role="TrG5h" value="nlists" />
         <node concept="_YKpA" id="2DKqMqOrPn$" role="1tU5fm">
-          <node concept="2I9FWS" id="2DKqMqOrPn_" role="_ZDj9" />
+          <node concept="_YKpA" id="2shrukT_nmn" role="_ZDj9">
+            <node concept="3Tqbb2" id="2shrukT_nmo" role="_ZDj9" />
+          </node>
         </node>
       </node>
       <node concept="3Tm1VV" id="2DKqMqOrPnB" role="1B3o_S" />
@@ -1299,7 +1306,9 @@
           </node>
           <node concept="3cpWsn" id="2DKqMqOrPo4" role="1Duv9x">
             <property role="TrG5h" value="nodes" />
-            <node concept="2I9FWS" id="2DKqMqOrPo5" role="1tU5fm" />
+            <node concept="_YKpA" id="2shrukT_nKK" role="1tU5fm">
+              <node concept="3Tqbb2" id="2shrukT_nKL" role="_ZDj9" />
+            </node>
           </node>
           <node concept="37vLTw" id="2DKqMqOrPo6" role="1DdaDG">
             <ref role="3cqZAo" node="2DKqMqOrPnz" resolve="nlists" />