diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 7ce471ec..8cfd00b1 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -2123,7 +2123,7 @@
                             <node concept="nsMwS" id="6_5E9TNz4X5" role="ns1xD">
                               <ref role="nsMwP" node="ZJPHcupkiC" resolve="typeParams" />
                               <node concept="1nq8_$" id="6_5E9TNz4X6" role="nsMwV">
-                                <node concept="a7P8L" id="6_5E9TNz4X7" role="1nq8_t">
+                                <node concept="a7P8L" id="5BZU0S2ruzw" role="1nq8_t">
                                   <ref role="a7OzE" node="6_5E9TNz4Xk" resolve="TPs" />
                                 </node>
                               </node>
@@ -3784,11 +3784,16 @@
                   <node concept="3fqX7Q" id="6zber0NPg0L" role="3uHU7w">
                     <node concept="1eOMI4" id="6zber0NPg0M" role="3fr31v">
                       <node concept="2OqwBi" id="6zber0NPg0S" role="1eOMHV">
-                        <node concept="2qgKlT" id="6zber0NPrhJ" role="2OqNvi">
-                          <ref role="37wK5l" to="tpek:7MS72Gc8avw" resolve="isStatic" />
+                        <node concept="2qgKlT" id="32iFMN79ped" role="2OqNvi">
+                          <ref role="37wK5l" to="tpek:6r77ob2USS8" resolve="isStatic" />
                         </node>
-                        <node concept="37vLTw" id="6zber0NPq8O" role="2Oq$k0">
-                          <ref role="3cqZAo" node="4xoHD1G0Ncl" resolve="cls" />
+                        <node concept="1PxgMI" id="32iFMN79oKP" role="2Oq$k0">
+                          <node concept="chp4Y" id="32iFMN79oL9" role="3oSUPX">
+                            <ref role="cht4Q" to="tpee:6r77ob2UL4Y" resolve="IClassifierMember" />
+                          </node>
+                          <node concept="37vLTw" id="6zber0NPq8O" role="1m5AlR">
+                            <ref role="3cqZAo" node="4xoHD1G0Ncl" resolve="cls" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -5610,6 +5615,23 @@
         </node>
       </node>
     </node>
+    <node concept="3AqmO8" id="2McmwEkm3J0" role="8PkJo">
+      <property role="TrG5h" value="allContainedIn" />
+      <node concept="1zAUYm" id="2McmwEkm3Jp" role="1zAUyy">
+        <property role="TrG5h" value="subsetList" />
+        <node concept="VbTHi" id="2McmwEkm3Ju" role="3gTf24" />
+      </node>
+      <node concept="1zAUYm" id="2McmwEkm3Jx" role="1zAUyy">
+        <property role="TrG5h" value="supersetList" />
+        <node concept="VbTHi" id="2McmwEkm3JC" role="3gTf24" />
+      </node>
+      <node concept="1zAUYm" id="2McmwEkm3JF" role="1zAUyy">
+        <property role="TrG5h" value="options" />
+        <node concept="3uibUv" id="2McmwEkm3JO" role="3gTf24">
+          <ref role="3uigEE" node="3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+        </node>
+      </node>
+    </node>
     <node concept="3AqmO8" id="5moyjRHrosW" role="8PkJo">
       <property role="TrG5h" value="containedInSafe" />
       <property role="3AqDzJ" value="2" />
@@ -5780,6 +5802,374 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="2McmwEkm3$c" role="1nK1Vg">
+      <property role="TrG5h" value="allContainedIn" />
+      <node concept="3clFbS" id="2McmwEkm3$d" role="1nLNMH">
+        <node concept="1nLNNL" id="2McmwEkm3IW" role="3cqZAp">
+          <node concept="1nLNMm" id="2McmwEkm3IX" role="1nLNNK">
+            <node concept="3Aq93q" id="2McmwEkm3JT" role="1nLNMb">
+              <node concept="3I6sU6" id="2McmwEkm3JU" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2McmwEkm3JY" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2McmwEkm3JX" role="3I6s78">
+                    <ref role="3AqCNq" node="2McmwEkm3J0" resolve="allContainedIn" />
+                    <node concept="1HFMs5" id="2McmwEkm3Md" role="3AunhB">
+                      <node concept="a7P8L" id="2McmwEkm3Ma" role="1uarlU">
+                        <ref role="a7OzE" node="2McmwEkm3K3" resolve="S" />
+                      </node>
+                      <node concept="Hz6ka" id="2McmwEkm3Mq" role="1uarlW">
+                        <node concept="1Pxxm1" id="2McmwEkm3Mv" role="Hz6kd">
+                          <node concept="3wAshV" id="2McmwEkm3M_" role="1Pxxm0">
+                            <node concept="a7P8L" id="2McmwEkm3M$" role="3wAq21">
+                              <ref role="a7OzE" node="2McmwEkm3Lq" resolve="SHead" />
+                            </node>
+                          </node>
+                          <node concept="3wAshV" id="2McmwEkm3MH" role="1Pxxm2">
+                            <node concept="a7P8L" id="2McmwEkm3MG" role="3wAq21">
+                              <ref role="a7OzE" node="2McmwEkm3L6" resolve="STail" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="2McmwEkm3Nr" role="3AunhB">
+                      <node concept="a7P8L" id="2McmwEkm3Ng" role="1uarlU">
+                        <ref role="a7OzE" node="2McmwEkm3Kf" resolve="T" />
+                      </node>
+                      <node concept="Hz6ka" id="2McmwEkm3NK" role="1uarlW">
+                        <node concept="1Pxxm1" id="2McmwEkm3OC" role="Hz6kd">
+                          <node concept="3wAshV" id="2McmwEkm3OI" role="1Pxxm0">
+                            <node concept="a7P8L" id="2McmwEkm3OP" role="3wAq21">
+                              <ref role="a7OzE" node="2McmwEkm3LX" resolve="THead" />
+                            </node>
+                          </node>
+                          <node concept="3wAshV" id="2McmwEkm3OW" role="1Pxxm2">
+                            <node concept="a7P8L" id="2McmwEkm3OV" role="3wAq21">
+                              <ref role="a7OzE" node="2McmwEkm3Le" resolve="TTail" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="2McmwEkm3Pm" role="3AunhB">
+                      <ref role="a7OzE" node="2McmwEkm3Kp" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm3K2" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm3K3" role="3XD1gS">
+                <property role="TrG5h" value="S" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm3L6" role="3XD1gS">
+                <property role="TrG5h" value="STail" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm3Kf" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm3Le" role="3XD1gS">
+                <property role="TrG5h" value="TTail" />
+              </node>
+              <node concept="VbTHi" id="2McmwEkm3Ka" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm3Lp" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm3Lq" role="3XD1gS">
+                <property role="TrG5h" value="SHead" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm3LX" role="3XD1gS">
+                <property role="TrG5h" value="THead" />
+              </node>
+              <node concept="32pEOW" id="2McmwEkm3LS" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm3Ko" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm3Kp" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+              <node concept="3uibUv" id="2McmwEkm3K$" role="3vLBG7">
+                <ref role="3uigEE" node="3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+            </node>
+            <node concept="3xSepi" id="2McmwEkm3QN" role="3xSepv">
+              <node concept="3Aq9E8" id="2McmwEkm3QO" role="3xSepj">
+                <node concept="3I6sU6" id="2McmwEkm3QP" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="2McmwEkm3QU" role="3I6sU7">
+                    <node concept="3Aqt3T" id="2McmwEkm3QT" role="3I6s78">
+                      <ref role="3AqCNq" node="oCcpswVfdC" resolve="containedInAlt" />
+                      <node concept="a7P8L" id="2McmwEkm3Ra" role="3AunhB">
+                        <ref role="a7OzE" node="2McmwEkm3Lq" resolve="SHead" />
+                      </node>
+                      <node concept="a7P8L" id="2McmwEkm3Rm" role="3AunhB">
+                        <ref role="a7OzE" node="2McmwEkm3LX" resolve="THead" />
+                      </node>
+                      <node concept="a7P8L" id="2McmwEkm3Ru" role="3AunhB">
+                        <ref role="a7OzE" node="2McmwEkm3Kp" resolve="Options" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="2McmwEkm3RS" role="3I6sU7">
+                    <node concept="3Aqt3T" id="2McmwEkm3RQ" role="3I6s78">
+                      <ref role="3AqCNq" node="2McmwEkm3J0" resolve="allContainedIn" />
+                      <node concept="a7P8L" id="2McmwEkm3S3" role="3AunhB">
+                        <ref role="a7OzE" node="2McmwEkm3L6" resolve="STail" />
+                      </node>
+                      <node concept="a7P8L" id="2McmwEkm3Sd" role="3AunhB">
+                        <ref role="a7OzE" node="2McmwEkm3Le" resolve="TTail" />
+                      </node>
+                      <node concept="a7P8L" id="2McmwEkm3Sp" role="3AunhB">
+                        <ref role="a7OzE" node="2McmwEkm3Kp" resolve="Options" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2McmwEkm436" role="3cqZAp" />
+        <node concept="1nLNNL" id="2McmwEkm3Xh" role="3cqZAp">
+          <node concept="1nLNMm" id="2McmwEkm3Xi" role="1nLNNK">
+            <node concept="3Aq93q" id="2McmwEkm3Xj" role="1nLNMb">
+              <node concept="3I6sU6" id="2McmwEkm3Xk" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2McmwEkm3Xl" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2McmwEkm3Xm" role="3I6s78">
+                    <ref role="3AqCNq" node="2McmwEkm3J0" resolve="allContainedIn" />
+                    <node concept="1HFMs5" id="2McmwEkm3Xn" role="3AunhB">
+                      <node concept="a7P8L" id="2McmwEkm3Xo" role="1uarlU">
+                        <ref role="a7OzE" node="2McmwEkm3XD" resolve="S" />
+                      </node>
+                      <node concept="Hz6ka" id="2McmwEkm3Xp" role="1uarlW">
+                        <node concept="KCUsM" id="2McmwEkm4j8" role="Hz6kd" />
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="2McmwEkm3Xv" role="3AunhB">
+                      <node concept="a7P8L" id="2McmwEkm3Xw" role="1uarlU">
+                        <ref role="a7OzE" node="2McmwEkm3XF" resolve="T" />
+                      </node>
+                      <node concept="Hz6ka" id="2McmwEkm3Xx" role="1uarlW">
+                        <node concept="KCUsM" id="2McmwEkm6cA" role="Hz6kd" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="2McmwEkm3XB" role="3AunhB">
+                      <ref role="a7OzE" node="2McmwEkm3XN" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm3XC" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm3XD" role="3XD1gS">
+                <property role="TrG5h" value="S" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm3XE" role="3XD1gS">
+                <property role="TrG5h" value="STail" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm3XF" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm3XG" role="3XD1gS">
+                <property role="TrG5h" value="TTail" />
+              </node>
+              <node concept="VbTHi" id="2McmwEkm3XH" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm3XI" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm3XJ" role="3XD1gS">
+                <property role="TrG5h" value="SHead" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm3XK" role="3XD1gS">
+                <property role="TrG5h" value="THead" />
+              </node>
+              <node concept="32pEOW" id="2McmwEkm3XL" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm3XM" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm3XN" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+              <node concept="3uibUv" id="2McmwEkm3XO" role="3vLBG7">
+                <ref role="3uigEE" node="3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2McmwEkm65a" role="3cqZAp" />
+        <node concept="1nLNNL" id="2McmwEkm5YV" role="3cqZAp">
+          <node concept="1nLNMm" id="2McmwEkm5YW" role="1nLNNK">
+            <node concept="3Aq93q" id="2McmwEkm5YX" role="1nLNMb">
+              <node concept="3I6sU6" id="2McmwEkm5YY" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2McmwEkm5YZ" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2McmwEkm5Z0" role="3I6s78">
+                    <ref role="3AqCNq" node="2McmwEkm3J0" resolve="allContainedIn" />
+                    <node concept="1HFMs5" id="2McmwEkm5Z1" role="3AunhB">
+                      <node concept="a7P8L" id="2McmwEkm5Z2" role="1uarlU">
+                        <ref role="a7OzE" node="2McmwEkm5Zf" resolve="S" />
+                      </node>
+                      <node concept="Hz6ka" id="2McmwEkm5Z3" role="1uarlW">
+                        <node concept="KCUsM" id="2McmwEkm5Z4" role="Hz6kd" />
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="2McmwEkm5Z5" role="3AunhB">
+                      <node concept="a7P8L" id="2McmwEkm5Z6" role="1uarlU">
+                        <ref role="a7OzE" node="2McmwEkm5Zh" resolve="T" />
+                      </node>
+                      <node concept="Hz6ka" id="2McmwEkm5Z7" role="1uarlW">
+                        <node concept="1Pxxm1" id="2McmwEkm5Z8" role="Hz6kd">
+                          <node concept="3wAshV" id="2McmwEkm5Z9" role="1Pxxm0">
+                            <node concept="a7P8L" id="2McmwEkm5Za" role="3wAq21">
+                              <ref role="a7OzE" node="2McmwEkm5Zm" resolve="THead" />
+                            </node>
+                          </node>
+                          <node concept="3wAshV" id="2McmwEkm5Zb" role="1Pxxm2">
+                            <node concept="a7P8L" id="2McmwEkm5Zc" role="3wAq21">
+                              <ref role="a7OzE" node="2McmwEkm5Zi" resolve="TTail" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="2McmwEkm5Zd" role="3AunhB">
+                      <ref role="a7OzE" node="2McmwEkm5Zp" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm5Ze" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm5Zf" role="3XD1gS">
+                <property role="TrG5h" value="S" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm5Zg" role="3XD1gS">
+                <property role="TrG5h" value="STail" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm5Zh" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm5Zi" role="3XD1gS">
+                <property role="TrG5h" value="TTail" />
+              </node>
+              <node concept="VbTHi" id="2McmwEkm5Zj" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm5Zk" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm5Zl" role="3XD1gS">
+                <property role="TrG5h" value="SHead" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm5Zm" role="3XD1gS">
+                <property role="TrG5h" value="THead" />
+              </node>
+              <node concept="32pEOW" id="2McmwEkm5Zn" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm5Zo" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm5Zp" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+              <node concept="3uibUv" id="2McmwEkm5Zq" role="3vLBG7">
+                <ref role="3uigEE" node="3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+            </node>
+            <node concept="3xSepi" id="2McmwEkm5Zr" role="3xSepv">
+              <node concept="3Aq9E8" id="2McmwEkm5Zs" role="3xSepj">
+                <node concept="3I6sU6" id="2McmwEkm5Zt" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="2McmwEkm5Zu" role="3I6sU7">
+                    <node concept="1lpGmL" id="2McmwEkm5Zv" role="3I6s78">
+                      <node concept="Xl_RD" id="2McmwEkm5Zw" role="1lp$hM">
+                        <property role="Xl_RC" value="mismatched parameter lists" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2McmwEkm5Aa" role="3cqZAp" />
+        <node concept="1nLNNL" id="2McmwEkm5wy" role="3cqZAp">
+          <node concept="1nLNMm" id="2McmwEkm5wz" role="1nLNNK">
+            <node concept="3Aq93q" id="2McmwEkm5w$" role="1nLNMb">
+              <node concept="3I6sU6" id="2McmwEkm5w_" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2McmwEkm5wA" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2McmwEkm5wB" role="3I6s78">
+                    <ref role="3AqCNq" node="2McmwEkm3J0" resolve="allContainedIn" />
+                    <node concept="1HFMs5" id="2McmwEkm5wC" role="3AunhB">
+                      <node concept="a7P8L" id="2McmwEkm5wD" role="1uarlU">
+                        <ref role="a7OzE" node="2McmwEkm5wQ" resolve="S" />
+                      </node>
+                      <node concept="Hz6ka" id="2McmwEkm5wE" role="1uarlW">
+                        <node concept="1Pxxm1" id="2McmwEkm5Mj" role="Hz6kd">
+                          <node concept="3wAshV" id="2McmwEkm5Mk" role="1Pxxm0">
+                            <node concept="a7P8L" id="2McmwEkm5Ml" role="3wAq21">
+                              <ref role="a7OzE" node="2McmwEkm5wW" resolve="SHead" />
+                            </node>
+                          </node>
+                          <node concept="3wAshV" id="2McmwEkm5Mm" role="1Pxxm2">
+                            <node concept="a7P8L" id="2McmwEkm5Mn" role="3wAq21">
+                              <ref role="a7OzE" node="2McmwEkm5wR" resolve="STail" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="1HFMs5" id="2McmwEkm5wG" role="3AunhB">
+                      <node concept="a7P8L" id="2McmwEkm5wH" role="1uarlU">
+                        <ref role="a7OzE" node="2McmwEkm5wS" resolve="T" />
+                      </node>
+                      <node concept="Hz6ka" id="2McmwEkm5wI" role="1uarlW">
+                        <node concept="KCUsM" id="2McmwEkm5U6" role="Hz6kd" />
+                      </node>
+                    </node>
+                    <node concept="a7P8L" id="2McmwEkm5wO" role="3AunhB">
+                      <ref role="a7OzE" node="2McmwEkm5x0" resolve="Options" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm5wP" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm5wQ" role="3XD1gS">
+                <property role="TrG5h" value="S" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm5wR" role="3XD1gS">
+                <property role="TrG5h" value="STail" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm5wS" role="3XD1gS">
+                <property role="TrG5h" value="T" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm5wT" role="3XD1gS">
+                <property role="TrG5h" value="TTail" />
+              </node>
+              <node concept="VbTHi" id="2McmwEkm5wU" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm5wV" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm5wW" role="3XD1gS">
+                <property role="TrG5h" value="SHead" />
+              </node>
+              <node concept="aZer4" id="2McmwEkm5wX" role="3XD1gS">
+                <property role="TrG5h" value="THead" />
+              </node>
+              <node concept="32pEOW" id="2McmwEkm5wY" role="3vLBG7" />
+            </node>
+            <node concept="3NuqgR" id="2McmwEkm5wZ" role="0Rg$4">
+              <node concept="aZer4" id="2McmwEkm5x0" role="3XD1gS">
+                <property role="TrG5h" value="Options" />
+              </node>
+              <node concept="3uibUv" id="2McmwEkm5x1" role="3vLBG7">
+                <ref role="3uigEE" node="3vTJNooZBhQ" resolve="ConvertsContext.Options" />
+              </node>
+            </node>
+            <node concept="3xSepi" id="2McmwEkm5x2" role="3xSepv">
+              <node concept="3Aq9E8" id="2McmwEkm5x3" role="3xSepj">
+                <node concept="3I6sU6" id="2McmwEkm5x4" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="2McmwEkm5x5" role="3I6sU7">
+                    <node concept="1lpGmL" id="2McmwEkm5x6" role="3I6s78">
+                      <node concept="Xl_RD" id="2McmwEkm5x7" role="1lp$hM">
+                        <property role="Xl_RC" value="mismatched parameter lists" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="12QmIo_7sl_" role="1nK1Vg">
       <property role="TrG5h" value="value_containedIn_reflexive" />
       <node concept="3clFbS" id="12QmIo_7slA" role="1nLNMH">
@@ -16019,185 +16409,135 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="2rIdnPwrAgu" role="1nK1Vg">
+    <node concept="1nLNMY" id="2McmwEkm6mW" role="1nK1Vg">
       <property role="TrG5h" value="dpromote_reflexive" />
-      <node concept="3clFbS" id="2rIdnPwrAgv" role="1nLNMH">
-        <node concept="3cpWs8" id="2rIdnPwrAgw" role="3cqZAp">
-          <node concept="3cpWsn" id="2rIdnPwrAgx" role="3cpWs9">
-            <property role="TrG5h" value="tvds" />
-            <node concept="2I9FWS" id="2rIdnPwrAgy" role="1tU5fm">
-              <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
-            </node>
-            <node concept="2OqwBi" id="2rIdnPwrAgz" role="33vP2m">
-              <node concept="3A2sRY" id="2rIdnPwrAg$" role="2Oq$k0">
-                <ref role="3A2yKK" node="2rIdnPwrAhI" resolve="cls" />
-              </node>
-              <node concept="3Tsc0h" id="2rIdnPwrAg_" role="2OqNvi">
-                <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="2rIdnPwrAgA" role="3cqZAp" />
-        <node concept="3Hbl2A" id="3mytCjZ047f" role="3cqZAp">
-          <node concept="3clFbS" id="3mytCjZ047h" role="9aQI4">
-            <node concept="1nLNNL" id="2rIdnPwrAgB" role="3cqZAp">
-              <node concept="1nLNMm" id="2rIdnPwrAgC" role="1nLNNK">
-                <node concept="3Aq93q" id="2rIdnPwrAgQ" role="1nLNMb">
+      <node concept="3clFbS" id="2McmwEkm6mX" role="1nLNMH">
+        <node concept="3clFbH" id="2McmwEkm6n4" role="3cqZAp" />
+        <node concept="3Hbl2A" id="2McmwEkm6n5" role="3cqZAp">
+          <node concept="3clFbS" id="2McmwEkm6n6" role="9aQI4">
+            <node concept="1nLNNL" id="2McmwEkm6n7" role="3cqZAp">
+              <node concept="1nLNMm" id="2McmwEkm6n8" role="1nLNNK">
+                <node concept="3Aq93q" id="2McmwEkm6n9" role="1nLNMb">
                   <property role="3ArMco" value="false" />
-                  <node concept="3I6sU6" id="2rIdnPwrAgR" role="3Ip0Jz">
-                    <node concept="3I6s7M" id="2rIdnPwrAgS" role="3I6sU7">
-                      <node concept="3Aqt3T" id="2rIdnPwrAgT" role="3I6s78">
+                  <node concept="3I6sU6" id="2McmwEkm6na" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="2McmwEkm6nb" role="3I6sU7">
+                      <node concept="3Aqt3T" id="2McmwEkm6nc" role="3I6s78">
                         <ref role="3AqCNq" node="WauyOOvQCY" resolve="dpromote" />
-                        <node concept="1HFMs5" id="2rIdnPwrAgU" role="3AunhB">
-                          <node concept="ns1u0" id="2rIdnPwrAgV" role="1uarlW">
+                        <node concept="1HFMs5" id="2McmwEkm6nd" role="3AunhB">
+                          <node concept="ns1u0" id="2McmwEkm6ne" role="1uarlW">
                             <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                            <node concept="nsMwS" id="2rIdnPwrAgW" role="ns1xD">
-                              <ref role="nsMwP" node="ZJPHcupkiC" resolve="typeParams" />
-                              <node concept="1nq8_$" id="2rIdnPwrAgX" role="nsMwV">
-                                <node concept="a7P8L" id="2rIdnPwrAgY" role="1nq8_t">
-                                  <ref role="a7OzE" node="2rIdnPwrAgG" resolve="SP" />
+                            <node concept="nsMwS" id="2McmwEkm6ni" role="ns1xD">
+                              <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
+                              <node concept="1nq8_$" id="2McmwEkm8PJ" role="nsMwV">
+                                <node concept="a7P8L" id="2McmwEkm8PI" role="1nq8_t">
+                                  <ref role="a7OzE" node="2McmwEkm8FJ" resolve="Cls" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="nsMwS" id="2rIdnPwrAgZ" role="ns1xD">
-                              <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                              <node concept="3A2sRY" id="2rIdnPwrAh1" role="nsMwV">
-                                <ref role="3A2yKK" node="2rIdnPwrAhI" resolve="cls" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="a7P8L" id="2rIdnPwrAh3" role="1uarlU">
-                            <ref role="a7OzE" node="2rIdnPwrAgF" resolve="S" />
-                          </node>
-                        </node>
-                        <node concept="1HFMs5" id="2rIdnPwrAh4" role="3AunhB">
-                          <node concept="ns1u0" id="2rIdnPwrAh5" role="1uarlW">
-                            <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
-                            <node concept="nsMwS" id="2rIdnPwrAh6" role="ns1xD">
+                            <node concept="nsMwS" id="2McmwEkm6nf" role="ns1xD">
                               <ref role="nsMwP" node="ZJPHcupkiC" resolve="typeParams" />
-                              <node concept="1nq8_$" id="2rIdnPwrAh7" role="nsMwV">
-                                <node concept="a7P8L" id="2rIdnPwrAh8" role="1nq8_t">
-                                  <ref role="a7OzE" node="2rIdnPwrAgL" resolve="TP" />
+                              <node concept="1nq8_$" id="2McmwEkm6ng" role="nsMwV">
+                                <node concept="a7P8L" id="2McmwEkm8sz" role="1nq8_t">
+                                  <ref role="a7OzE" node="2McmwEkm7Z6" resolve="SParam" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="nsMwS" id="2rIdnPwrAh9" role="ns1xD">
+                          </node>
+                          <node concept="a7P8L" id="2McmwEkm6nk" role="1uarlU">
+                            <ref role="a7OzE" node="2McmwEkm6nw" resolve="S" />
+                          </node>
+                        </node>
+                        <node concept="1HFMs5" id="2McmwEkm6nl" role="3AunhB">
+                          <node concept="ns1u0" id="2McmwEkm6nm" role="1uarlW">
+                            <ref role="ns1xF" node="JOGAOsVt2a" resolve="classifier" />
+                            <node concept="nsMwS" id="2McmwEkm6nq" role="ns1xD">
                               <ref role="nsMwP" node="JOGAOsVt2c" resolve="classifier" />
-                              <node concept="3A2sRY" id="2rIdnPwrAhb" role="nsMwV">
-                                <ref role="3A2yKK" node="2rIdnPwrAhI" resolve="cls" />
+                              <node concept="1nq8_$" id="2McmwEkm8UL" role="nsMwV">
+                                <node concept="a7P8L" id="2McmwEkm8UK" role="1nq8_t">
+                                  <ref role="a7OzE" node="2McmwEkm8FJ" resolve="Cls" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="nsMwS" id="2McmwEkm6nn" role="ns1xD">
+                              <ref role="nsMwP" node="ZJPHcupkiC" resolve="typeParams" />
+                              <node concept="1nq8_$" id="2McmwEkm6no" role="nsMwV">
+                                <node concept="a7P8L" id="2McmwEkm8Sg" role="1nq8_t">
+                                  <ref role="a7OzE" node="2McmwEkm84m" resolve="TParam" />
+                                </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="a7P8L" id="2rIdnPwrAhd" role="1uarlU">
-                            <ref role="a7OzE" node="2rIdnPwrAgK" resolve="T" />
+                          <node concept="a7P8L" id="2McmwEkm6ns" role="1uarlU">
+                            <ref role="a7OzE" node="2McmwEkm6n_" resolve="T" />
                           </node>
                         </node>
-                        <node concept="a7P8L" id="2rIdnPwrAhe" role="3AunhB">
-                          <ref role="a7OzE" node="2rIdnPwrAgP" resolve="SubclassPath" />
+                        <node concept="a7P8L" id="2McmwEkm6nt" role="3AunhB">
+                          <ref role="a7OzE" node="2McmwEkm6o4" resolve="SubclassPath" />
                         </node>
-                        <node concept="a7P8L" id="oCcpsx1KSd" role="3AunhB">
-                          <ref role="a7OzE" node="oCcpsx1KRx" resolve="Options" />
+                        <node concept="a7P8L" id="2McmwEkm6nu" role="3AunhB">
+                          <ref role="a7OzE" node="2McmwEkm6o7" resolve="Options" />
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3NuqgR" id="2rIdnPwrAgE" role="0Rg$4">
-                  <node concept="aZer4" id="2rIdnPwrAgF" role="3XD1gS">
+                <node concept="3NuqgR" id="2McmwEkm6nv" role="0Rg$4">
+                  <node concept="aZer4" id="2McmwEkm6nw" role="3XD1gS">
                     <property role="TrG5h" value="S" />
                   </node>
-                  <node concept="aZer4" id="2rIdnPwrAgG" role="3XD1gS">
-                    <property role="TrG5h" value="SP" />
-                    <node concept="2OqwBi" id="2rIdnPwrAgH" role="3gj$pD">
-                      <node concept="37vLTw" id="2rIdnPwrAgI" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2rIdnPwrAgx" resolve="tvds" />
-                      </node>
-                      <node concept="34oBXx" id="2rIdnPwrAgJ" role="2OqNvi" />
-                    </node>
-                  </node>
-                  <node concept="aZer4" id="2rIdnPwrAgK" role="3XD1gS">
+                  <node concept="aZer4" id="2McmwEkm6n_" role="3XD1gS">
                     <property role="TrG5h" value="T" />
                   </node>
-                  <node concept="aZer4" id="2rIdnPwrAgL" role="3XD1gS">
-                    <property role="TrG5h" value="TP" />
-                    <node concept="2OqwBi" id="2rIdnPwrAgM" role="3gj$pD">
-                      <node concept="37vLTw" id="2rIdnPwrAgN" role="2Oq$k0">
-                        <ref role="3cqZAo" node="2rIdnPwrAgx" resolve="tvds" />
-                      </node>
-                      <node concept="34oBXx" id="2rIdnPwrAgO" role="2OqNvi" />
-                    </node>
-                  </node>
-                  <node concept="32pEOW" id="24ciDNzxNDf" role="3vLBG7" />
+                  <node concept="32pEOW" id="2McmwEkm6nE" role="3vLBG7" />
                 </node>
-                <node concept="3xSepi" id="6E2cNicdij1" role="3xSepv">
-                  <node concept="3Aq9E8" id="2rIdnPwrAhn" role="3xSepj">
-                    <node concept="3I6sU6" id="2rIdnPwrAho" role="3Ip0Jz">
-                      <node concept="3IrJb3" id="2rIdnPwrAhp" role="3I6sU7">
-                        <node concept="3clFbS" id="2rIdnPwrAhq" role="3IrJb0">
-                          <node concept="1Dw8fO" id="2rIdnPwrAhr" role="3cqZAp">
-                            <node concept="3clFbS" id="2rIdnPwrAhs" role="2LFqv$">
-                              <node concept="3Aqczg" id="2rIdnPwrAht" role="3cqZAp">
-                                <node concept="3Aqt3T" id="2rIdnPwrAhu" role="3Aqpz8">
-                                  <ref role="3AqCNq" node="oCcpswVfdC" resolve="containedInAlt" />
-                                  <node concept="a7P8L" id="2rIdnPwrAhv" role="3AunhB">
-                                    <ref role="a7OzE" node="2rIdnPwrAgG" resolve="SP" />
-                                    <node concept="37vLTw" id="2rIdnPwrAhw" role="3gCZO6">
-                                      <ref role="3cqZAo" node="2rIdnPwrAhz" resolve="i" />
-                                    </node>
-                                  </node>
-                                  <node concept="a7P8L" id="2rIdnPwrAhx" role="3AunhB">
-                                    <ref role="a7OzE" node="2rIdnPwrAgL" resolve="TP" />
-                                    <node concept="37vLTw" id="2rIdnPwrAhy" role="3gCZO6">
-                                      <ref role="3cqZAo" node="2rIdnPwrAhz" resolve="i" />
-                                    </node>
-                                  </node>
-                                  <node concept="a7P8L" id="oCcpsx1KX1" role="3AunhB">
-                                    <ref role="a7OzE" node="oCcpsx1KRx" resolve="Options" />
-                                  </node>
-                                </node>
-                              </node>
-                            </node>
-                            <node concept="3cpWsn" id="2rIdnPwrAhz" role="1Duv9x">
-                              <property role="TrG5h" value="i" />
-                              <node concept="10Oyi0" id="2rIdnPwrAh$" role="1tU5fm" />
-                              <node concept="3cmrfG" id="2rIdnPwrAh_" role="33vP2m">
-                                <property role="3cmrfH" value="0" />
-                              </node>
-                            </node>
-                            <node concept="3eOVzh" id="2rIdnPwrAhA" role="1Dwp0S">
-                              <node concept="37vLTw" id="2rIdnPwrAhB" role="3uHU7B">
-                                <ref role="3cqZAo" node="2rIdnPwrAhz" resolve="i" />
-                              </node>
-                              <node concept="2OqwBi" id="2rIdnPwrAhC" role="3uHU7w">
-                                <node concept="37vLTw" id="2rIdnPwrAhD" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="2rIdnPwrAgx" resolve="tvds" />
-                                </node>
-                                <node concept="34oBXx" id="2rIdnPwrAhE" role="2OqNvi" />
-                              </node>
-                            </node>
-                            <node concept="3uNrnE" id="2rIdnPwrAhF" role="1Dwrff">
-                              <node concept="37vLTw" id="2rIdnPwrAhG" role="2$L3a6">
-                                <ref role="3cqZAo" node="2rIdnPwrAhz" resolve="i" />
-                              </node>
-                            </node>
+                <node concept="3xSepi" id="2McmwEkm6nF" role="3xSepv">
+                  <node concept="3Aq9E8" id="2McmwEkm6nG" role="3xSepj">
+                    <node concept="3I6sU6" id="2McmwEkm6nH" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="2McmwEkm9eK" role="3I6sU7">
+                        <node concept="3Aqt3T" id="2McmwEkm9eJ" role="3I6s78">
+                          <ref role="3AqCNq" node="2McmwEkm3J0" resolve="allContainedIn" />
+                          <node concept="a7P8L" id="2McmwEkm9jA" role="3AunhB">
+                            <ref role="a7OzE" node="2McmwEkm7Z6" resolve="SParam" />
+                          </node>
+                          <node concept="a7P8L" id="2McmwEkm9ow" role="3AunhB">
+                            <ref role="a7OzE" node="2McmwEkm84m" resolve="TParam" />
+                          </node>
+                          <node concept="a7P8L" id="2McmwEkm9ts" role="3AunhB">
+                            <ref role="a7OzE" node="2McmwEkm6o7" resolve="Options" />
                           </node>
                         </node>
                       </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3NuqgR" id="39eNUjlcEwv" role="0Rg$4">
-                  <node concept="aZer4" id="2rIdnPwrAgP" role="3XD1gS">
+                <node concept="3NuqgR" id="2McmwEkm7Z5" role="0Rg$4">
+                  <node concept="aZer4" id="2McmwEkm7Z6" role="3XD1gS">
+                    <property role="TrG5h" value="SParam" />
+                  </node>
+                  <node concept="aZer4" id="2McmwEkm84m" role="3XD1gS">
+                    <property role="TrG5h" value="TParam" />
+                  </node>
+                  <node concept="VbTHi" id="2McmwEkm81R" role="3vLBG7" />
+                </node>
+                <node concept="3NuqgR" id="2McmwEkm6o3" role="0Rg$4">
+                  <node concept="aZer4" id="2McmwEkm6o4" role="3XD1gS">
                     <property role="TrG5h" value="SubclassPath" />
                   </node>
-                  <node concept="VbTHi" id="39eNUjlcEwV" role="3vLBG7" />
+                  <node concept="VbTHi" id="2McmwEkm6o5" role="3vLBG7" />
                 </node>
-                <node concept="3NuqgR" id="oCcpsx1KRw" role="0Rg$4">
-                  <node concept="aZer4" id="oCcpsx1KRx" role="3XD1gS">
+                <node concept="3NuqgR" id="2McmwEkm8FI" role="0Rg$4">
+                  <node concept="aZer4" id="2McmwEkm8FJ" role="3XD1gS">
+                    <property role="TrG5h" value="Cls" />
+                  </node>
+                  <node concept="3Tqbb2" id="2McmwEkm8Is" role="3vLBG7">
+                    <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+                  </node>
+                </node>
+                <node concept="3NuqgR" id="2McmwEkm6o6" role="0Rg$4">
+                  <node concept="aZer4" id="2McmwEkm6o7" role="3XD1gS">
                     <property role="TrG5h" value="Options" />
                   </node>
-                  <node concept="3uibUv" id="oCcpsx1KRy" role="3vLBG7">
+                  <node concept="3uibUv" id="2McmwEkm6o8" role="3vLBG7">
                     <ref role="3uigEE" node="3vTJNooZBhQ" resolve="ConvertsContext.Options" />
                   </node>
                 </node>
@@ -16206,12 +16546,6 @@
           </node>
         </node>
       </node>
-      <node concept="2t___k" id="2rIdnPwrAhH" role="1nLNMg">
-        <ref role="2t_S0q" to="tpee:g7pOWCK" resolve="Classifier" />
-        <node concept="3A20r5" id="2rIdnPwrAhI" role="2t_VXX">
-          <property role="TrG5h" value="cls" />
-        </node>
-      </node>
     </node>
     <node concept="1nLNMY" id="24yJnOJhgLD" role="1nK1Vg">
       <property role="TrG5h" value="dpromote_induction" />
@@ -41565,6 +41899,15 @@
               </node>
               <node concept="32pEOW" id="53tmmMthGX_" role="3vLBG7" />
             </node>
+            <node concept="3NuqgR" id="32iFMN78j_K" role="0Rg$4">
+              <node concept="aZer4" id="32iFMN78j_L" role="3XD1gS">
+                <property role="TrG5h" value="Bounds" />
+              </node>
+              <node concept="aZer4" id="32iFMN78jAv" role="3XD1gS">
+                <property role="TrG5h" value="TVars" />
+              </node>
+              <node concept="32pEOW" id="32iFMN78jAi" role="3vLBG7" />
+            </node>
             <node concept="3xSepi" id="6EK6UBPpajP" role="3xSepv">
               <node concept="3Aq9E8" id="6EK6UBPpajQ" role="3xSepj">
                 <node concept="3I6sU6" id="6EK6UBPpajR" role="3Ip0Jz">
@@ -41803,6 +42146,22 @@
                                 </node>
                               </node>
                             </node>
+                            <node concept="nsMwS" id="32iFMN78j_m" role="ns1xD">
+                              <ref role="nsMwP" node="4btN1w5A15P" resolve="bounds" />
+                              <node concept="1nq8_$" id="32iFMN78jBi" role="nsMwV">
+                                <node concept="a7P8L" id="32iFMN78jBh" role="1nq8_t">
+                                  <ref role="a7OzE" node="32iFMN78j_L" resolve="Bounds" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="nsMwS" id="32iFMN78j_y" role="ns1xD">
+                              <ref role="nsMwP" node="4btN1w5A0F6" resolve="tvars" />
+                              <node concept="1nq8_$" id="32iFMN78jBs" role="nsMwV">
+                                <node concept="a7P8L" id="32iFMN78jBr" role="1nq8_t">
+                                  <ref role="a7OzE" node="32iFMN78jAv" resolve="TVars" />
+                                </node>
+                              </node>
+                            </node>
                           </node>
                           <node concept="9KH4l" id="53tmmMthFf$" role="3A8w4Q">
                             <node concept="a7P8L" id="53tmmMthFfE" role="9KHbC">
@@ -45646,6 +46005,14 @@
                   </node>
                 </node>
               </node>
+              <node concept="nsMwS" id="32iFMN78j$0" role="ns1xD">
+                <ref role="nsMwP" node="4btN1w5A3Te" resolve="ctxTvars" />
+                <node concept="1nq8_$" id="32iFMN78j_d" role="nsMwV">
+                  <node concept="a7P8L" id="32iFMN78j_c" role="1nq8_t">
+                    <ref role="a7OzE" node="32iFMN78j$N" resolve="Wcard" />
+                  </node>
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -45727,6 +46094,12 @@
         </node>
         <node concept="VbTHi" id="3qUnz9vhT3D" role="3vLBG7" />
       </node>
+      <node concept="3uniRu" id="32iFMN78j$M" role="3hEOkk">
+        <node concept="aZer4" id="32iFMN78j$N" role="3XD1gS">
+          <property role="TrG5h" value="Wcard" />
+        </node>
+        <node concept="32pEOW" id="32iFMN78j_3" role="3vLBG7" />
+      </node>
     </node>
     <node concept="3hwh0R" id="53tmmMs9igR" role="0oKgB">
       <property role="TrG5h" value="instantiateScheme" />
@@ -54710,6 +55083,12 @@
                   </node>
                   <node concept="32pEOW" id="24ciDNzxNFn" role="3vLBG7" />
                 </node>
+                <node concept="3NuqgR" id="32iFMN78jCS" role="0Rg$4">
+                  <node concept="aZer4" id="32iFMN78jCT" role="3XD1gS">
+                    <property role="TrG5h" value="CTVars" />
+                  </node>
+                  <node concept="32pEOW" id="32iFMN78jDq" role="3vLBG7" />
+                </node>
                 <node concept="3xSepi" id="6E2cNicdikA" role="3xSepv">
                   <node concept="3Aq9E8" id="3wxtToEiJIV" role="3xSepj">
                     <node concept="3I6sU6" id="3wxtToEiJJ4" role="3Ip0Jz">
@@ -54748,6 +55127,14 @@
                                     </node>
                                   </node>
                                 </node>
+                                <node concept="nsMwS" id="32iFMN78jCG" role="ns1xD">
+                                  <ref role="nsMwP" node="4btN1w5A3Te" resolve="ctxTvars" />
+                                  <node concept="1nq8_$" id="32iFMN78jDy" role="nsMwV">
+                                    <node concept="a7P8L" id="32iFMN78jDx" role="1nq8_t">
+                                      <ref role="a7OzE" node="32iFMN78jCT" resolve="CTVars" />
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                               <node concept="9KH4l" id="5Oz70LKjjjM" role="3sO8UZ">
                                 <node concept="a7P8L" id="5Oz70LKjpHl" role="9KHbC">