From 3a8a397299359ab32f2f19e01eb65a060c38612a Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 18 Nov 2015 15:52:09 +0100
Subject: [PATCH] Typechecking templates: simplifying the code, trying to unify
 the ways type variables are processed

---
 .../typesystem2/samplechecker/template.mps    | 657 +++++++++---------
 1 file changed, 334 insertions(+), 323 deletions(-)

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 2247f9f6..9f61e823 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
@@ -151,6 +151,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>
@@ -167,7 +170,6 @@
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
-      <concept id="7812454656619025412" name="jetbrains.mps.baseLanguage.structure.LocalMethodCall" flags="nn" index="1rXfSq" />
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
@@ -861,17 +863,54 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="2yOynGeW79h" role="3cqZAp">
-            <node concept="2YIFZM" id="2yOynGeW79i" role="3clFbG">
-              <ref role="37wK5l" node="1zN1RIluaah" resolve="produce_typevars_pattern" />
-              <ref role="1Pybhc" node="bNMVLgEtTD" resolve="TypeConstraintUtil" />
-              <node concept="3A9UF8" id="2yOynGeW79j" role="37wK5m">
-                <node concept="a7P8L" id="2yOynGeW79k" role="3A9W3M">
-                  <ref role="a7OzE" node="2yOynGeW79c" resolve="TypeVar" />
+          <node concept="1Dw8fO" id="6f8YfqpZbx" role="3cqZAp">
+            <node concept="3clFbS" id="6f8YfqpZby" role="2LFqv$">
+              <node concept="3clFbF" id="6f8YfqpZt_" role="3cqZAp">
+                <node concept="2YIFZM" id="6f8YfqpZwO" role="3clFbG">
+                  <ref role="37wK5l" node="7mm1a3qNU4M" resolve="newType_recursive_pattern" />
+                  <ref role="1Pybhc" node="bNMVLgEtTD" resolve="TypeConstraintUtil" />
+                  <node concept="3A9UF8" id="6f8YfqpZys" role="37wK5m">
+                    <node concept="a7P8L" id="6f8YfqpZyu" role="3A9W3M">
+                      <ref role="a7OzE" node="2yOynGeW79c" resolve="TypeVar" />
+                      <node concept="aYllk" id="6f8YfqpZzC" role="aYIAd">
+                        <node concept="37vLTw" id="6f8YfqpZJU" role="aYrYs">
+                          <ref role="3cqZAo" node="6f8YfqpZbz" resolve="i" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1y4W85" id="6f8Yfqq1c1" role="37wK5m">
+                    <node concept="37vLTw" id="6f8Yfqq1jl" role="1y58nS">
+                      <ref role="3cqZAo" node="6f8YfqpZbz" resolve="i" />
+                    </node>
+                    <node concept="39rIew" id="6f8Yfqq093" role="1y566C">
+                      <ref role="39rHqR" node="2yOynGeW5AD" resolve="tvars" />
+                    </node>
+                  </node>
                 </node>
               </node>
-              <node concept="39rIew" id="2yOynGeW8lT" role="37wK5m">
-                <ref role="39rHqR" node="2yOynGeW5AD" resolve="tvars" />
+            </node>
+            <node concept="3cpWsn" id="6f8YfqpZbz" role="1Duv9x">
+              <property role="TrG5h" value="i" />
+              <node concept="10Oyi0" id="6f8YfqpZb$" role="1tU5fm" />
+              <node concept="3cmrfG" id="6f8YfqpZb_" role="33vP2m">
+                <property role="3cmrfH" value="0" />
+              </node>
+            </node>
+            <node concept="3eOVzh" id="6f8YfqpZbA" role="1Dwp0S">
+              <node concept="2OqwBi" id="6f8YfqpZbB" role="3uHU7w">
+                <node concept="39rIew" id="6f8YfqpZjj" role="2Oq$k0">
+                  <ref role="39rHqR" node="2yOynGeW5AD" resolve="tvars" />
+                </node>
+                <node concept="34oBXx" id="6f8YfqpZbD" role="2OqNvi" />
+              </node>
+              <node concept="37vLTw" id="6f8YfqpZbE" role="3uHU7B">
+                <ref role="3cqZAo" node="6f8YfqpZbz" resolve="i" />
+              </node>
+            </node>
+            <node concept="3uNrnE" id="6f8YfqpZbF" role="1Dwrff">
+              <node concept="37vLTw" id="6f8YfqpZbG" role="2$L3a6">
+                <ref role="3cqZAo" node="6f8YfqpZbz" resolve="i" />
               </node>
             </node>
           </node>
@@ -983,17 +1022,54 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbF" id="7mm1a3qT1Jz" role="3cqZAp">
-            <node concept="2YIFZM" id="7mm1a3qT1J$" role="3clFbG">
-              <ref role="37wK5l" node="1zN1RIluaah" resolve="produce_typevars_pattern" />
-              <ref role="1Pybhc" node="bNMVLgEtTD" resolve="TypeConstraintUtil" />
-              <node concept="3A9UF8" id="7mm1a3qT1J_" role="37wK5m">
-                <node concept="a7P8L" id="7mm1a3qT1JA" role="3A9W3M">
-                  <ref role="a7OzE" node="7mm1a3qT1Ju" resolve="TypeVar" />
+          <node concept="1Dw8fO" id="6f8YfqpWWc" role="3cqZAp">
+            <node concept="3clFbS" id="6f8YfqpWWd" role="2LFqv$">
+              <node concept="3clFbF" id="6f8YfqpXat" role="3cqZAp">
+                <node concept="2YIFZM" id="6f8YfqpXdG" role="3clFbG">
+                  <ref role="37wK5l" node="7mm1a3qNU4M" resolve="newType_recursive_pattern" />
+                  <ref role="1Pybhc" node="bNMVLgEtTD" resolve="TypeConstraintUtil" />
+                  <node concept="3A9UF8" id="6f8YfqpXfk" role="37wK5m">
+                    <node concept="a7P8L" id="6f8YfqpXfm" role="3A9W3M">
+                      <ref role="a7OzE" node="7mm1a3qT1Ju" resolve="TypeVar" />
+                      <node concept="aYllk" id="6f8YfqpXgw" role="aYIAd">
+                        <node concept="37vLTw" id="6f8YfqpXq0" role="aYrYs">
+                          <ref role="3cqZAo" node="6f8YfqpWWe" resolve="i" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1y4W85" id="6f8YfqpY_a" role="37wK5m">
+                    <node concept="37vLTw" id="6f8YfqpYJG" role="1y58nS">
+                      <ref role="3cqZAo" node="6f8YfqpWWe" resolve="i" />
+                    </node>
+                    <node concept="39rIew" id="6f8YfqpXHw" role="1y566C">
+                      <ref role="39rHqR" node="7mm1a3qT1Pr" resolve="tvars" />
+                    </node>
+                  </node>
                 </node>
               </node>
-              <node concept="39rIew" id="7mm1a3qT3Kp" role="37wK5m">
-                <ref role="39rHqR" node="7mm1a3qT1Pr" resolve="tvars" />
+            </node>
+            <node concept="3cpWsn" id="6f8YfqpWWe" role="1Duv9x">
+              <property role="TrG5h" value="i" />
+              <node concept="10Oyi0" id="6f8YfqpWWf" role="1tU5fm" />
+              <node concept="3cmrfG" id="6f8YfqpWWg" role="33vP2m">
+                <property role="3cmrfH" value="0" />
+              </node>
+            </node>
+            <node concept="3eOVzh" id="6f8YfqpWWh" role="1Dwp0S">
+              <node concept="2OqwBi" id="6f8YfqpWWi" role="3uHU7w">
+                <node concept="39rIew" id="6f8YfqpX2X" role="2Oq$k0">
+                  <ref role="39rHqR" node="7mm1a3qT1Pr" resolve="tvars" />
+                </node>
+                <node concept="34oBXx" id="6f8YfqpWWk" role="2OqNvi" />
+              </node>
+              <node concept="37vLTw" id="6f8YfqpWWl" role="3uHU7B">
+                <ref role="3cqZAo" node="6f8YfqpWWe" resolve="i" />
+              </node>
+            </node>
+            <node concept="3uNrnE" id="6f8YfqpWWm" role="1Dwrff">
+              <node concept="37vLTw" id="6f8YfqpWWn" role="2$L3a6">
+                <ref role="3cqZAo" node="6f8YfqpWWe" resolve="i" />
               </node>
             </node>
           </node>
@@ -1119,159 +1195,102 @@
       </node>
       <node concept="3Aq9E8" id="7KcYPxpXtAn" role="3otmyu">
         <node concept="3clFbS" id="7KcYPxpXtAo" role="3Aqf5P">
-          <node concept="3clFbH" id="7KcYPxpXy0V" role="3cqZAp" />
+          <node concept="3X$Joe" id="6f8YfqtOny" role="3cqZAp">
+            <node concept="aZer4" id="6f8YfqtOnz" role="3XD1gS">
+              <property role="TrG5h" value="OpClsType" />
+            </node>
+            <node concept="aZer4" id="6f8YfqtOvL" role="3XD1gS">
+              <property role="TrG5h" value="OpClsTypevar" />
+              <node concept="aYllk" id="6f8YfqtOwd" role="aZjLW">
+                <node concept="2OqwBi" id="6f8YfqtP1_" role="aYrYs">
+                  <node concept="2OqwBi" id="6f8YfqtSEB" role="2Oq$k0">
+                    <node concept="39rIew" id="6f8YfqtSvD" role="2Oq$k0">
+                      <ref role="39rHqR" node="6f8YfqtSmv" resolve="cls" />
+                    </node>
+                    <node concept="3Tsc0h" id="6f8YfqtTdp" role="2OqNvi">
+                      <ref role="3TtcxE" to="tpee:g96eVAe" />
+                    </node>
+                  </node>
+                  <node concept="34oBXx" id="6f8YfqtRrF" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3Aqczg" id="6f8YfqtTry" role="3cqZAp">
+            <node concept="AVZhr" id="6f8YfqtTrq" role="3Aqpz8">
+              <node concept="a7P8L" id="6f8YfqtT_$" role="3A0MwX">
+                <ref role="a7OzE" node="6f8YfqtOvL" resolve="OpClsTypevar" />
+              </node>
+              <node concept="aYllk" id="6f8YfqtTrs" role="2pcbIn">
+                <node concept="3TUQnm" id="6f8YfqtT_3" role="aYrYs">
+                  <ref role="3TV0OU" to="tpee:g7pOWCK" resolve="Classifier" />
+                </node>
+              </node>
+              <node concept="a7P8L" id="6f8YfqtT$Y" role="3A07fg">
+                <ref role="a7OzE" node="6f8YfqtOnz" resolve="OpClsType" />
+              </node>
+              <node concept="aYllk" id="6f8YfqtT_j" role="3A0lYS">
+                <node concept="39rIew" id="6f8YfqtT_q" role="aYrYs">
+                  <ref role="39rHqR" node="6f8YfqtSmv" resolve="cls" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3Aqczg" id="6f8YfqtT_G" role="3cqZAp">
+            <node concept="3Aqt3T" id="6f8YfqtT_H" role="3Aqpz8">
+              <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+              <node concept="a7P8L" id="6f8YfqtT_I" role="3AunhB">
+                <ref role="a7OzE" node="7nkyKX7$Edo" resolve="OpndType" />
+              </node>
+              <node concept="a7P8L" id="6f8YfqtTJl" role="3AunhB">
+                <ref role="a7OzE" node="6f8YfqtOnz" resolve="OpClsType" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="6f8YfqtHge" role="3cqZAp" />
           <node concept="3X$Joe" id="7KcYPxpXCHR" role="3cqZAp">
             <node concept="aZer4" id="7KcYPxpY05N" role="3XD1gS">
               <property role="TrG5h" value="FroType" />
             </node>
-            <node concept="aZer4" id="7KcYPxpXOlx" role="3XD1gS">
-              <property role="TrG5h" value="OpndCls" />
-            </node>
-            <node concept="aZer4" id="7KcYPxpXCHV" role="3XD1gS">
-              <property role="TrG5h" value="TypeParam" />
-              <node concept="aYllk" id="7KcYPxpXCK0" role="aZjLW">
-                <node concept="2OqwBi" id="7KcYPxpXDqR" role="aYrYs">
-                  <node concept="39rIew" id="7KcYPxpXCK4" role="2Oq$k0">
-                    <ref role="39rHqR" node="7KcYPxpXy12" resolve="tvds" />
-                  </node>
-                  <node concept="34oBXx" id="7KcYPxpXI0X" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
           </node>
-          <node concept="3clFbH" id="7KcYPxpXI2l" role="3cqZAp" />
-          <node concept="1Dw8fO" id="6f8Yfqloc9" role="3cqZAp">
-            <node concept="3clFbS" id="6f8Yfqlocb" role="2LFqv$">
-              <node concept="3Aqczg" id="6f8YfqluJF" role="3cqZAp">
-                <node concept="AVZhr" id="6f8YfqluJG" role="3Aqpz8">
-                  <node concept="aYllk" id="6f8YfqluJH" role="3A0lYS">
-                    <node concept="1y4W85" id="6f8YfqlwC9" role="aYrYs">
-                      <node concept="37vLTw" id="6f8YfqlxdC" role="1y58nS">
-                        <ref role="3cqZAo" node="6f8Yfqlocc" resolve="i" />
-                      </node>
-                      <node concept="39rIew" id="6f8Yfqlw76" role="1y566C">
-                        <ref role="39rHqR" node="7KcYPxpXy12" resolve="tvds" />
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="aYllk" id="6f8YfqluJJ" role="2pcbIn">
-                    <node concept="3TUQnm" id="6f8YfqluJK" role="aYrYs">
-                      <ref role="3TV0OU" to="tpee:g96syBo" resolve="TypeVariableReference" />
-                    </node>
-                  </node>
-                  <node concept="a7P8L" id="6f8YfqluJL" role="3A07fg">
-                    <ref role="a7OzE" node="7KcYPxpXCHV" resolve="TypeParam" />
-                    <node concept="aYllk" id="6f8YfqluJM" role="aYIAd">
-                      <node concept="37vLTw" id="6f8YfqluJO" role="aYrYs">
-                        <ref role="3cqZAo" node="6f8Yfqlocc" resolve="i" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3cpWsn" id="6f8Yfqlocc" role="1Duv9x">
-              <property role="TrG5h" value="i" />
-              <node concept="10Oyi0" id="6f8YfqloRV" role="1tU5fm" />
-              <node concept="3cmrfG" id="6f8YfqloSc" role="33vP2m">
-                <property role="3cmrfH" value="0" />
-              </node>
-            </node>
-            <node concept="3eOVzh" id="6f8Yfqlp3F" role="1Dwp0S">
-              <node concept="2OqwBi" id="6f8YfqlpQ9" role="3uHU7w">
-                <node concept="39rIew" id="6f8Yfqlp3W" role="2Oq$k0">
-                  <ref role="39rHqR" node="7KcYPxpXy12" resolve="tvds" />
-                </node>
-                <node concept="34oBXx" id="6f8YfqlsHD" role="2OqNvi" />
-              </node>
-              <node concept="37vLTw" id="6f8YfqloSl" role="3uHU7B">
-                <ref role="3cqZAo" node="6f8Yfqlocc" resolve="i" />
-              </node>
-            </node>
-            <node concept="3uNrnE" id="6f8Yfqlu3$" role="1Dwrff">
-              <node concept="37vLTw" id="6f8Yfqlu3A" role="2$L3a6">
-                <ref role="3cqZAo" node="6f8Yfqlocc" resolve="i" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="7KcYPxpXOjd" role="3cqZAp" />
-          <node concept="3Aqczg" id="7KcYPxpXOlC" role="3cqZAp">
-            <node concept="AVZhr" id="7KcYPxpXOnK" role="3Aqpz8">
-              <node concept="a7P8L" id="7KcYPxpXQxz" role="3A0MwX">
-                <ref role="a7OzE" node="7KcYPxpXCHV" resolve="TypeParam" />
-              </node>
-              <node concept="aYllk" id="7KcYPxpXOnM" role="2pcbIn">
-                <node concept="3TUQnm" id="7KcYPxpXOsj" role="aYrYs">
-                  <ref role="3TV0OU" to="tpee:g7uibYu" resolve="ClassifierType" />
-                </node>
-              </node>
-              <node concept="a7P8L" id="7KcYPxpXOnW" role="3A07fg">
-                <ref role="a7OzE" node="7KcYPxpXOlx" resolve="OpndCls" />
-              </node>
-              <node concept="aYllk" id="7KcYPxpXOst" role="3A0lYS">
-                <node concept="1PxgMI" id="7KcYPxpXQvZ" role="aYrYs">
-                  <ref role="1PxNhF" to="tpee:g7pOWCK" resolve="Classifier" />
-                  <node concept="2OqwBi" id="7KcYPxpXQw0" role="1PxMeX">
-                    <node concept="2OqwBi" id="7KcYPxpXQw1" role="2Oq$k0">
-                      <node concept="3A2sRY" id="7KcYPxpXQw2" role="2Oq$k0">
-                        <ref role="3A2yKK" node="7KcYPxpXuF3" resolve="fro" />
-                      </node>
-                      <node concept="3TrEf2" id="7KcYPxpXQw3" role="2OqNvi">
-                        <ref role="3Tt5mk" to="tpee:hqOxapj" />
-                      </node>
-                    </node>
-                    <node concept="1mfA1w" id="7KcYPxpXQw4" role="2OqNvi" />
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="7KcYPxpXRrW" role="3cqZAp" />
-          <node concept="3Aqczg" id="7KcYPxpXRwz" role="3cqZAp">
-            <node concept="3Aqt3T" id="7KcYPxpXRyT" role="3Aqpz8">
-              <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-              <node concept="a7P8L" id="7KcYPxpXRz2" role="3AunhB">
-                <ref role="a7OzE" node="7nkyKX7$Edo" resolve="OpndType" />
-              </node>
-              <node concept="a7P8L" id="7KcYPxpXRzc" role="3AunhB">
-                <ref role="a7OzE" node="7KcYPxpXOlx" resolve="OpndCls" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="7KcYPxpXRzg" role="3cqZAp" />
-          <node concept="3clFbF" id="7KcYPxpXWyQ" role="3cqZAp">
-            <node concept="2YIFZM" id="7KcYPxpXWS_" role="3clFbG">
-              <ref role="37wK5l" node="1zN1RIl8e0S" resolve="newType_recursive" />
+          <node concept="3clFbF" id="6f8YfqtTJB" role="3cqZAp">
+            <node concept="2YIFZM" id="6f8YfqtTJC" role="3clFbG">
               <ref role="1Pybhc" node="bNMVLgEtTD" resolve="TypeConstraintUtil" />
-              <node concept="3A9UF8" id="7KcYPxpY0aU" role="37wK5m">
-                <node concept="a7P8L" id="7KcYPxpY0c_" role="3A9W3M">
+              <ref role="37wK5l" node="1zN1RIl8e0S" resolve="newType_recursive" />
+              <node concept="3A9UF8" id="6f8YfqtTJD" role="37wK5m">
+                <node concept="a7P8L" id="6f8YfqtTJE" role="3A9W3M">
                   <ref role="a7OzE" node="7KcYPxpY05N" resolve="FroType" />
                 </node>
               </node>
-              <node concept="2OqwBi" id="7KcYPxpY10_" role="37wK5m">
-                <node concept="2OqwBi" id="7KcYPxpY0ht" role="2Oq$k0">
-                  <node concept="3A2sRY" id="7KcYPxpY0ea" role="2Oq$k0">
+              <node concept="2OqwBi" id="6f8YfqtTJF" role="37wK5m">
+                <node concept="2OqwBi" id="6f8YfqtTJG" role="2Oq$k0">
+                  <node concept="3A2sRY" id="6f8YfqtTJH" role="2Oq$k0">
                     <ref role="3A2yKK" node="7KcYPxpXuF3" resolve="fro" />
                   </node>
-                  <node concept="3TrEf2" id="7KcYPxpY0GC" role="2OqNvi">
+                  <node concept="3TrEf2" id="6f8YfqtTJI" role="2OqNvi">
                     <ref role="3Tt5mk" to="tpee:hqOxapj" />
                   </node>
                 </node>
-                <node concept="3TrEf2" id="7KcYPxpY1E5" role="2OqNvi">
+                <node concept="3TrEf2" id="6f8YfqtTJJ" role="2OqNvi">
                   <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" />
                 </node>
               </node>
-              <node concept="3A9UF8" id="7KcYPxpY291" role="37wK5m">
-                <node concept="a7P8L" id="7KcYPxpY2g4" role="3A9W3M">
-                  <ref role="a7OzE" node="7KcYPxpXCHV" resolve="TypeParam" />
+              <node concept="3A9UF8" id="6f8YfqtTJK" role="37wK5m">
+                <node concept="a7P8L" id="6f8YfqtTVp" role="3A9W3M">
+                  <ref role="a7OzE" node="6f8YfqtOvL" resolve="OpClsTypevar" />
                 </node>
               </node>
-              <node concept="39rIew" id="7KcYPxpY2q5" role="37wK5m">
-                <ref role="39rHqR" node="7KcYPxpXy12" resolve="tvds" />
+              <node concept="2OqwBi" id="6f8YfqtU4u" role="37wK5m">
+                <node concept="39rIew" id="6f8YfqtU4v" role="2Oq$k0">
+                  <ref role="39rHqR" node="6f8YfqtSmv" resolve="cls" />
+                </node>
+                <node concept="3Tsc0h" id="6f8YfqtU4w" role="2OqNvi">
+                  <ref role="3TtcxE" to="tpee:g96eVAe" />
+                </node>
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="7KcYPxpXR_C" role="3cqZAp" />
+          <node concept="3clFbH" id="6f8YfqtHhn" role="3cqZAp" />
           <node concept="3Aqczg" id="7KcYPxpY3vZ" role="3cqZAp">
             <node concept="3XxkQB" id="7KcYPxpY3Ci" role="3Aqpz8">
               <node concept="a7P8L" id="7KcYPxpY3Cz" role="3Xxm5W">
@@ -1292,35 +1311,29 @@
           <property role="TrG5h" value="fro" />
         </node>
       </node>
-      <node concept="2caHhw" id="7KcYPxpXy10" role="20w6XG">
-        <node concept="3clFbS" id="7KcYPxpXy11" role="16YjZG">
-          <node concept="3clFbF" id="7KcYPxpXy2l" role="3cqZAp">
-            <node concept="2OqwBi" id="7KcYPxpX_R3" role="3clFbG">
-              <node concept="1PxgMI" id="7KcYPxpX_ID" role="2Oq$k0">
-                <ref role="1PxNhF" to="tpee:g7pOWCK" resolve="Classifier" />
-                <node concept="2OqwBi" id="7KcYPxpXyAP" role="1PxMeX">
-                  <node concept="2OqwBi" id="7KcYPxpXy3L" role="2Oq$k0">
-                    <node concept="3A2sRY" id="7KcYPxpXy2k" role="2Oq$k0">
-                      <ref role="3A2yKK" node="7KcYPxpXuF3" resolve="fro" />
-                    </node>
-                    <node concept="3TrEf2" id="7KcYPxpXymX" role="2OqNvi">
-                      <ref role="3Tt5mk" to="tpee:hqOxapj" />
-                    </node>
+      <node concept="2caHhw" id="6f8YfqtSmt" role="20w6XG">
+        <node concept="3clFbS" id="6f8YfqtSmu" role="16YjZG">
+          <node concept="3clFbF" id="6f8YfqtSsY" role="3cqZAp">
+            <node concept="1PxgMI" id="6f8YfqtSt0" role="3clFbG">
+              <ref role="1PxNhF" to="tpee:g7pOWCK" resolve="Classifier" />
+              <node concept="2OqwBi" id="6f8YfqtSt1" role="1PxMeX">
+                <node concept="2OqwBi" id="6f8YfqtSt2" role="2Oq$k0">
+                  <node concept="3A2sRY" id="6f8YfqtSt3" role="2Oq$k0">
+                    <ref role="3A2yKK" node="7KcYPxpXuF3" resolve="fro" />
+                  </node>
+                  <node concept="3TrEf2" id="6f8YfqtSt4" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tpee:hqOxapj" />
                   </node>
-                  <node concept="1mfA1w" id="7KcYPxpX_9t" role="2OqNvi" />
                 </node>
-              </node>
-              <node concept="3Tsc0h" id="7KcYPxpXARN" role="2OqNvi">
-                <ref role="3TtcxE" to="tpee:g96eVAe" />
+                <node concept="1mfA1w" id="6f8YfqtSt5" role="2OqNvi" />
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="7KcYPxpXBNK" role="3cqZAp" />
         </node>
-        <node concept="391aah" id="7KcYPxpXy12" role="390Shn">
-          <property role="TrG5h" value="tvds" />
-          <node concept="2I9FWS" id="7KcYPxpXy25" role="390C7c">
-            <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+        <node concept="391aah" id="6f8YfqtSmv" role="390Shn">
+          <property role="TrG5h" value="cls" />
+          <node concept="3Tqbb2" id="6f8YfqtSsN" role="390C7c">
+            <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
           </node>
         </node>
       </node>
@@ -1653,7 +1666,7 @@
               </node>
               <node concept="aYllk" id="5JTOzCQQszJ" role="3A0lYS">
                 <node concept="3A2sRY" id="3Qp4N06bUEk" role="aYrYs">
-                  <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tpd" />
+                  <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tvd" />
                 </node>
               </node>
               <node concept="aYllk" id="5JTOzCQQsAP" role="2pcbIn">
@@ -1667,34 +1680,6 @@
       </node>
       <node concept="3Aq9E8" id="3Qp4N06bUEn" role="3otmyu">
         <node concept="3clFbS" id="3Qp4N06bUEo" role="3Aqf5P">
-          <node concept="3X$Joe" id="7mm1a3qW3wC" role="3cqZAp">
-            <node concept="aZer4" id="7mm1a3qW3A5" role="3XD1gS">
-              <property role="TrG5h" value="VarRef" />
-              <node concept="aYllk" id="7mm1a3qW3A6" role="aZjLW">
-                <node concept="2OqwBi" id="7mm1a3qW3A7" role="aYrYs">
-                  <node concept="39rIew" id="7mm1a3qW3A8" role="2Oq$k0">
-                    <ref role="39rHqR" node="1zN1RIkR37A" resolve="tvars" />
-                  </node>
-                  <node concept="34oBXx" id="7mm1a3qW3A9" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbF" id="1zN1RIl6_2U" role="3cqZAp">
-            <node concept="2YIFZM" id="7mm1a3qW3qe" role="3clFbG">
-              <ref role="37wK5l" node="1zN1RIluaah" resolve="produce_typevars_pattern" />
-              <ref role="1Pybhc" node="bNMVLgEtTD" resolve="TypeConstraintUtil" />
-              <node concept="3A9UF8" id="7mm1a3qW3qh" role="37wK5m">
-                <node concept="a7P8L" id="7mm1a3qW3HM" role="3A9W3M">
-                  <ref role="a7OzE" node="7mm1a3qW3A5" resolve="VarRef" />
-                </node>
-              </node>
-              <node concept="39rIew" id="7mm1a3qW3qj" role="37wK5m">
-                <ref role="39rHqR" node="1zN1RIkR37A" resolve="tvars" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="7mm1a3qW3bD" role="3cqZAp" />
           <node concept="3Aqczg" id="7mm1a3qMdjS" role="3cqZAp">
             <node concept="3A8Hvi" id="7mm1a3qMdjT" role="3Aqpz8">
               <node concept="aYllk" id="7mm1a3qMdjU" role="3A8w4Q">
@@ -1713,8 +1698,8 @@
                         <property role="1oi5yK" value="" />
                         <node concept="22Ky0T" id="5YVX0wIhP8d" role="lGtFl">
                           <node concept="2OqwBi" id="5YVX0wIhP8e" role="22Ky0K">
-                            <node concept="3A2sRY" id="5YVX0wIhP8f" role="2Oq$k0">
-                              <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tpd" />
+                            <node concept="3A2sRY" id="6f8YfqvZca" role="2Oq$k0">
+                              <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tvd" />
                             </node>
                             <node concept="3TrcHB" id="5YVX0wIhP8g" role="2OqNvi">
                               <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1731,7 +1716,7 @@
                           <node concept="2OqwBi" id="5YVX0wIhP8j" role="22Ky0K">
                             <node concept="2JrnkZ" id="5YVX0wIhP8k" role="2Oq$k0">
                               <node concept="3A2sRY" id="5YVX0wIhP8l" role="2JrQYb">
-                                <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tpd" />
+                                <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tvd" />
                               </node>
                             </node>
                             <node concept="liA8E" id="5YVX0wIhP8m" role="2OqNvi">
@@ -1753,7 +1738,72 @@
               </node>
             </node>
           </node>
-          <node concept="3clFbH" id="7mm1a3qMdaN" role="3cqZAp" />
+          <node concept="3clFbH" id="6f8YfqvRxY" role="3cqZAp" />
+          <node concept="3X$Joe" id="7mm1a3qW3wC" role="3cqZAp">
+            <node concept="aZer4" id="7mm1a3qW3A5" role="3XD1gS">
+              <property role="TrG5h" value="VarRef" />
+              <node concept="aYllk" id="7mm1a3qW3A6" role="aZjLW">
+                <node concept="2OqwBi" id="7mm1a3qW3A7" role="aYrYs">
+                  <node concept="39rIew" id="7mm1a3qW3A8" role="2Oq$k0">
+                    <ref role="39rHqR" node="1zN1RIkR37A" resolve="tvars" />
+                  </node>
+                  <node concept="34oBXx" id="7mm1a3qW3A9" role="2OqNvi" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Dw8fO" id="6f8YfqpSrx" role="3cqZAp">
+            <node concept="3clFbS" id="6f8YfqpSry" role="2LFqv$">
+              <node concept="3clFbF" id="6f8YfqpTsm" role="3cqZAp">
+                <node concept="2YIFZM" id="6f8YfqpTv_" role="3clFbG">
+                  <ref role="37wK5l" node="7mm1a3qNU4M" resolve="newType_recursive_pattern" />
+                  <ref role="1Pybhc" node="bNMVLgEtTD" resolve="TypeConstraintUtil" />
+                  <node concept="3A9UF8" id="6f8YfqpTxe" role="37wK5m">
+                    <node concept="a7P8L" id="6f8YfqpTxg" role="3A9W3M">
+                      <ref role="a7OzE" node="7mm1a3qW3A5" resolve="VarRef" />
+                      <node concept="aYllk" id="6f8YfqpTyq" role="aYIAd">
+                        <node concept="37vLTw" id="6f8YfqpTJc" role="aYrYs">
+                          <ref role="3cqZAo" node="6f8YfqpSrz" resolve="i" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="1y4W85" id="6f8YfqpV4h" role="37wK5m">
+                    <node concept="37vLTw" id="6f8YfqpVbh" role="1y58nS">
+                      <ref role="3cqZAo" node="6f8YfqpSrz" resolve="i" />
+                    </node>
+                    <node concept="39rIew" id="6f8YfqpU9g" role="1y566C">
+                      <ref role="39rHqR" node="1zN1RIkR37A" resolve="tvars" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWsn" id="6f8YfqpSrz" role="1Duv9x">
+              <property role="TrG5h" value="i" />
+              <node concept="10Oyi0" id="6f8YfqpSr$" role="1tU5fm" />
+              <node concept="3cmrfG" id="6f8YfqpSr_" role="33vP2m">
+                <property role="3cmrfH" value="0" />
+              </node>
+            </node>
+            <node concept="3eOVzh" id="6f8YfqpSrA" role="1Dwp0S">
+              <node concept="2OqwBi" id="6f8YfqpSrB" role="3uHU7w">
+                <node concept="39rIew" id="6f8YfqpTh$" role="2Oq$k0">
+                  <ref role="39rHqR" node="1zN1RIkR37A" resolve="tvars" />
+                </node>
+                <node concept="34oBXx" id="6f8YfqpSrD" role="2OqNvi" />
+              </node>
+              <node concept="37vLTw" id="6f8YfqpSrE" role="3uHU7B">
+                <ref role="3cqZAo" node="6f8YfqpSrz" resolve="i" />
+              </node>
+            </node>
+            <node concept="3uNrnE" id="6f8YfqpSrF" role="1Dwrff">
+              <node concept="37vLTw" id="6f8YfqpSrG" role="2$L3a6">
+                <ref role="3cqZAo" node="6f8YfqpSrz" resolve="i" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="7mm1a3qW3bD" role="3cqZAp" />
           <node concept="3clFbJ" id="2KVRGowYzHO" role="3cqZAp">
             <node concept="3clFbS" id="2KVRGowYzHR" role="3clFbx">
               <node concept="3X$Joe" id="3Qp4N06bUEp" role="3cqZAp">
@@ -1773,7 +1823,7 @@
                   </node>
                   <node concept="2OqwBi" id="7mm1a3qO5c3" role="37wK5m">
                     <node concept="3A2sRY" id="7mm1a3qO5c4" role="2Oq$k0">
-                      <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tpd" />
+                      <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tvd" />
                     </node>
                     <node concept="3TrEf2" id="7mm1a3qO5c5" role="2OqNvi">
                       <ref role="3Tt5mk" to="tpee:hFztrQw" />
@@ -1797,7 +1847,7 @@
             <node concept="2OqwBi" id="2KVRGowY$uH" role="3clFbw">
               <node concept="2OqwBi" id="2KVRGowYzO5" role="2Oq$k0">
                 <node concept="3A2sRY" id="2KVRGowYzLE" role="2Oq$k0">
-                  <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tpd" />
+                  <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tvd" />
                 </node>
                 <node concept="3TrEf2" id="2KVRGowY$fG" role="2OqNvi">
                   <ref role="3Tt5mk" to="tpee:hFztrQw" />
@@ -1854,7 +1904,7 @@
             </node>
             <node concept="2OqwBi" id="3Qp4N06bUFd" role="1DdaDG">
               <node concept="3A2sRY" id="3Qp4N06bUFe" role="2Oq$k0">
-                <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tpd" />
+                <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tvd" />
               </node>
               <node concept="3Tsc0h" id="3Qp4N06bUFf" role="2OqNvi">
                 <ref role="3TtcxE" to="tpee:hFD4UhQ" />
@@ -1878,7 +1928,7 @@
                     <ref role="37wK5l" to="oy3s:1GDBwhEE__7" resolve="StringLogical" />
                     <node concept="2OqwBi" id="1zN1RIlocFV" role="37wK5m">
                       <node concept="3A2sRY" id="1zN1RIlocBG" role="2Oq$k0">
-                        <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tpd" />
+                        <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tvd" />
                       </node>
                       <node concept="3TrcHB" id="1zN1RIlodMm" role="2OqNvi">
                         <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1894,7 +1944,7 @@
       <node concept="2t___k" id="5NuEpF1jvVT" role="20_v8_">
         <ref role="2t_S0q" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
         <node concept="3A20r5" id="3Qp4N06bUFn" role="2t_VXX">
-          <property role="TrG5h" value="tpd" />
+          <property role="TrG5h" value="tvd" />
         </node>
       </node>
       <node concept="2caHhw" id="1zN1RIkR37$" role="20w6XG">
@@ -1909,7 +1959,7 @@
             <node concept="2OqwBi" id="1zN1RIkR42R" role="3clFbG">
               <node concept="2OqwBi" id="1zN1RIkR42U" role="2Oq$k0">
                 <node concept="3A2sRY" id="1zN1RIkR42V" role="2Oq$k0">
-                  <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tpd" />
+                  <ref role="3A2yKK" node="3Qp4N06bUFn" resolve="tvd" />
                 </node>
                 <node concept="2Rf3mk" id="1zN1RIkR42W" role="2OqNvi">
                   <node concept="1xMEDy" id="1zN1RIkR42X" role="1xVPHs">
@@ -1970,6 +2020,7 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbH" id="6f8YfqvROa" role="3cqZAp" />
           <node concept="3clFbJ" id="7mm1a3qM7e6" role="3cqZAp">
             <node concept="3clFbS" id="7mm1a3qM7e7" role="3clFbx">
               <node concept="3X$Joe" id="7mm1a3qM7e8" role="3cqZAp">
@@ -3638,6 +3689,20 @@
           <property role="TrG5h" value="cls" />
         </node>
       </node>
+      <node concept="cBwPQ" id="6f8Yfqs0vE" role="30RCb4">
+        <node concept="3clFbS" id="6f8Yfqs0vF" role="16YjZG">
+          <node concept="3SKdUt" id="6f8Yfqs0vW" role="3cqZAp">
+            <node concept="3SKdUq" id="6f8Yfqs0w1" role="3SKWNk">
+              <property role="3SKdUp" value="FIXME inactive rule" />
+            </node>
+          </node>
+          <node concept="3clFbF" id="6f8Yfqs0vJ" role="3cqZAp">
+            <node concept="3clFbT" id="6f8Yfqs0vI" role="3clFbG">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="AVZhu" id="6qJjpCjoNmg" role="3ArX_J">
       <property role="TrG5h" value="checkBaseMethodDeclaration" />
@@ -3730,6 +3795,23 @@
       </node>
       <node concept="cBwPQ" id="tIwzd1SxsI" role="30RCb4">
         <node concept="3clFbS" id="tIwzd1SxsJ" role="16YjZG">
+          <node concept="3SKdUt" id="6f8Yfqs18s" role="3cqZAp">
+            <node concept="3SKdUq" id="6f8Yfqs19l" role="3SKWNk">
+              <property role="3SKdUp" value="FIXME: inactive rule" />
+            </node>
+          </node>
+          <node concept="3clFbJ" id="6f8Yfqs0Cs" role="3cqZAp">
+            <node concept="3clFbS" id="6f8Yfqs0Cu" role="3clFbx">
+              <node concept="3cpWs6" id="6f8Yfqs0Sp" role="3cqZAp">
+                <node concept="3clFbT" id="6f8Yfqs0Sv" role="3cqZAk">
+                  <property role="3clFbU" value="false" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbT" id="6f8Yfqs0K_" role="3clFbw">
+              <property role="3clFbU" value="true" />
+            </node>
+          </node>
           <node concept="3clFbF" id="77AxcO4PY5M" role="3cqZAp">
             <node concept="22lmx$" id="7gr_romok1T" role="3clFbG">
               <node concept="2OqwBi" id="7gr_romooxB" role="3uHU7w">
@@ -5289,81 +5371,6 @@
         </node>
       </node>
     </node>
-    <node concept="2tJIrI" id="1zN1RIl8dTm" role="jymVt" />
-    <node concept="2YIFZL" id="1zN1RIluaah" role="jymVt">
-      <property role="TrG5h" value="produce_typevars_pattern" />
-      <node concept="37vLTG" id="1zN1RIluaai" role="3clF46">
-        <property role="TrG5h" value="TypeVar" />
-        <node concept="10Q1$e" id="1zN1RIluaaj" role="1tU5fm">
-          <node concept="26uTi9" id="1zN1RIluaak" role="10Q1$1" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="1zN1RIluaal" role="3clF46">
-        <property role="TrG5h" value="tvars" />
-        <node concept="2I9FWS" id="1zN1RIluaam" role="1tU5fm">
-          <ref role="2I9WkF" to="tpee:g96syBo" resolve="TypeVariableReference" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="1zN1RIluaan" role="3clF45" />
-      <node concept="3Tm1VV" id="1zN1RIluaao" role="1B3o_S" />
-      <node concept="3clFbS" id="1zN1RIluaap" role="3clF47">
-        <node concept="3SKdUt" id="1zN1RIluaaq" role="3cqZAp">
-          <node concept="3SKdUq" id="1zN1RIluaar" role="3SKWNk">
-            <property role="3SKdUp" value="FIXME: index must alwasy start from 0" />
-          </node>
-        </node>
-        <node concept="3cpWs8" id="1zN1RIluaas" role="3cqZAp">
-          <node concept="3cpWsn" id="1zN1RIluaat" role="3cpWs9">
-            <property role="TrG5h" value="i" />
-            <node concept="10Oyi0" id="1zN1RIluaau" role="1tU5fm" />
-            <node concept="3cmrfG" id="1zN1RIluaav" role="33vP2m">
-              <property role="3cmrfH" value="0" />
-            </node>
-          </node>
-        </node>
-        <node concept="1DcWWT" id="1zN1RIluaaw" role="3cqZAp">
-          <node concept="3clFbS" id="1zN1RIluaax" role="2LFqv$">
-            <node concept="3clFbF" id="6f8YfpUsb2" role="3cqZAp">
-              <node concept="1rXfSq" id="6f8YfpUsb0" role="3clFbG">
-                <ref role="37wK5l" node="7mm1a3qNU4M" resolve="newType_recursive_pattern" />
-                <node concept="AH0OO" id="6f8YfpUsrE" role="37wK5m">
-                  <node concept="3uNrnE" id="6f8YfpUsNN" role="AHEQo">
-                    <node concept="37vLTw" id="6f8YfpUsNP" role="2$L3a6">
-                      <ref role="3cqZAo" node="1zN1RIluaat" resolve="i" />
-                    </node>
-                  </node>
-                  <node concept="37vLTw" id="6f8YfpUslK" role="AHHXb">
-                    <ref role="3cqZAo" node="1zN1RIluaai" resolve="TypeVar" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="6f8YfpUt05" role="37wK5m">
-                  <ref role="3cqZAo" node="1zN1RIluaaH" resolve="tvr" />
-                </node>
-              </node>
-            </node>
-          </node>
-          <node concept="3cpWsn" id="1zN1RIluaaH" role="1Duv9x">
-            <property role="TrG5h" value="tvr" />
-            <node concept="3Tqbb2" id="1zN1RIluaaI" role="1tU5fm">
-              <ref role="ehGHo" to="tpee:g96syBo" resolve="TypeVariableReference" />
-            </node>
-          </node>
-          <node concept="37vLTw" id="1zN1RIluaaJ" role="1DdaDG">
-            <ref role="3cqZAo" node="1zN1RIluaal" resolve="tvars" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="1zN1RIluaaK" role="2AJF6D">
-        <ref role="2AI5Lk" to="i348:4OKkcnfu_Am" resolve="RuleTemplateMethod" />
-        <node concept="1SXeKx" id="1zN1RIluaaL" role="2B76xF">
-          <ref role="2B6OnR" to="i348:4OKkcnfu_An" resolve="value" />
-          <node concept="Rm8GO" id="1zN1RIluc0v" role="2B70Vg">
-            <ref role="Rm8GQ" to="i348:4OKkcnfu_Ak" resolve="BODY" />
-            <ref role="1Px2BO" to="i348:4OKkcnfu_Ag" resolve="RuleTemplateMehodKind" />
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="2tJIrI" id="7mm1a3qM66I" role="jymVt" />
     <node concept="3Tm1VV" id="bNMVLgEtTE" role="1B3o_S" />
   </node>
@@ -6050,41 +6057,19 @@
       </node>
       <node concept="3Aq9E8" id="1zN1RIlreLc" role="3otmyu">
         <node concept="3clFbS" id="1zN1RIlreLd" role="3Aqf5P">
-          <node concept="3cpWs8" id="1zN1RIlueV2" role="3cqZAp">
-            <node concept="3cpWsn" id="1zN1RIlueV3" role="3cpWs9">
-              <property role="TrG5h" value="cls" />
-              <node concept="3Tqbb2" id="1zN1RIlueV4" role="1tU5fm">
-                <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
-              </node>
-              <node concept="1PxgMI" id="1zN1RIlueV5" role="33vP2m">
-                <ref role="1PxNhF" to="tpee:g7pOWCK" resolve="Classifier" />
-                <node concept="2OqwBi" id="1zN1RIlueV6" role="1PxMeX">
-                  <node concept="2OqwBi" id="1zN1RIlueV7" role="2Oq$k0">
-                    <node concept="3A2sRY" id="1zN1RIlueV8" role="2Oq$k0">
-                      <ref role="3A2yKK" node="1zN1RIlreLm" resolve="imcop" />
-                    </node>
-                    <node concept="3TrEf2" id="1ffsG7bt$kB" role="2OqNvi">
-                      <ref role="3Tt5mk" to="tpee:hwllgre" />
-                    </node>
-                  </node>
-                  <node concept="1mfA1w" id="1zN1RIlueVa" role="2OqNvi" />
-                </node>
-              </node>
-            </node>
-          </node>
           <node concept="3X$Joe" id="1zN1RIlueVb" role="3cqZAp">
             <node concept="aZer4" id="1zN1RIlueVc" role="3XD1gS">
-              <property role="TrG5h" value="MethCType" />
+              <property role="TrG5h" value="MethClsType" />
             </node>
             <node concept="aZer4" id="1zN1RIlueVd" role="3XD1gS">
-              <property role="TrG5h" value="MethCTypeVar" />
+              <property role="TrG5h" value="MethClsTypeVar" />
               <node concept="aYllk" id="1zN1RIlueVe" role="aZjLW">
                 <node concept="2OqwBi" id="1zN1RIlueVf" role="aYrYs">
                   <node concept="2OqwBi" id="1zN1RIlueVg" role="2Oq$k0">
-                    <node concept="37vLTw" id="1zN1RIlueVh" role="2Oq$k0">
-                      <ref role="3cqZAo" node="1zN1RIlueV3" resolve="cls" />
+                    <node concept="39rIew" id="6f8YfqtMtX" role="2Oq$k0">
+                      <ref role="39rHqR" node="6f8YfqtHr$" resolve="cls" />
                     </node>
-                    <node concept="3Tsc0h" id="1zN1RIlueVi" role="2OqNvi">
+                    <node concept="3Tsc0h" id="6f8YfqtNwC" role="2OqNvi">
                       <ref role="3TtcxE" to="tpee:g96eVAe" />
                     </node>
                   </node>
@@ -6096,15 +6081,15 @@
           <node concept="3Aqczg" id="1zN1RIlueVk" role="3cqZAp">
             <node concept="AVZhr" id="1zN1RIlueVl" role="3Aqpz8">
               <node concept="a7P8L" id="1zN1RIlueVm" role="3A07fg">
-                <ref role="a7OzE" node="1zN1RIlueVc" resolve="MethCType" />
+                <ref role="a7OzE" node="1zN1RIlueVc" resolve="MethClsType" />
               </node>
               <node concept="aYllk" id="1zN1RIlueVn" role="3A0lYS">
-                <node concept="37vLTw" id="1zN1RIlueVo" role="aYrYs">
-                  <ref role="3cqZAo" node="1zN1RIlueV3" resolve="cls" />
+                <node concept="39rIew" id="6f8YfqtMtZ" role="aYrYs">
+                  <ref role="39rHqR" node="6f8YfqtHr$" resolve="cls" />
                 </node>
               </node>
               <node concept="a7P8L" id="1zN1RIlueVp" role="3A0MwX">
-                <ref role="a7OzE" node="1zN1RIlueVd" resolve="MethCTypeVar" />
+                <ref role="a7OzE" node="1zN1RIlueVd" resolve="MethClsTypeVar" />
               </node>
               <node concept="aYllk" id="1zN1RIlueVq" role="2pcbIn">
                 <node concept="3TUQnm" id="1zN1RIlueVr" role="aYrYs">
@@ -6120,7 +6105,7 @@
                 <ref role="a7OzE" node="6YKq674srLD" resolve="OpndType" />
               </node>
               <node concept="a7P8L" id="1zN1RIlueVv" role="3AunhB">
-                <ref role="a7OzE" node="1zN1RIlueVc" resolve="MethCType" />
+                <ref role="a7OzE" node="1zN1RIlueVc" resolve="MethClsType" />
               </node>
             </node>
           </node>
@@ -6178,7 +6163,7 @@
                   <node concept="3Aqczg" id="1zN1RIluur2" role="3cqZAp">
                     <node concept="3A8Hvi" id="1zN1RIluur6" role="3Aqpz8">
                       <node concept="a7P8L" id="1zN1RIluurs" role="3A8w4Q">
-                        <ref role="a7OzE" node="1zN1RIlueVd" resolve="MethCTypeVar" />
+                        <ref role="a7OzE" node="1zN1RIlueVd" resolve="MethClsTypeVar" />
                         <node concept="aYllk" id="1zN1RIluw0_" role="aYIAd">
                           <node concept="2OqwBi" id="1zN1RIlvfam" role="aYrYs">
                             <node concept="37vLTw" id="1zN1RIlvf8f" role="2Oq$k0">
@@ -6216,10 +6201,10 @@
               </node>
             </node>
             <node concept="2OqwBi" id="1zN1RIlugEU" role="1DdaDG">
-              <node concept="37vLTw" id="1zN1RIlugEV" role="2Oq$k0">
-                <ref role="3cqZAo" node="1zN1RIlueV3" resolve="cls" />
+              <node concept="39rIew" id="6f8YfqtMu1" role="2Oq$k0">
+                <ref role="39rHqR" node="6f8YfqtHr$" resolve="cls" />
               </node>
-              <node concept="3Tsc0h" id="1zN1RIlugEW" role="2OqNvi">
+              <node concept="3Tsc0h" id="6f8YfqtNo4" role="2OqNvi">
                 <ref role="3TtcxE" to="tpee:g96eVAe" />
               </node>
             </node>
@@ -6324,6 +6309,32 @@
           <property role="TrG5h" value="imcop" />
         </node>
       </node>
+      <node concept="2caHhw" id="6f8YfqtHry" role="20w6XG">
+        <node concept="3clFbS" id="6f8YfqtHrz" role="16YjZG">
+          <node concept="3clFbF" id="6f8YfqtHVl" role="3cqZAp">
+            <node concept="1PxgMI" id="6f8YfqtHVn" role="3clFbG">
+              <ref role="1PxNhF" to="tpee:g7pOWCK" resolve="Classifier" />
+              <node concept="2OqwBi" id="6f8YfqtHVo" role="1PxMeX">
+                <node concept="2OqwBi" id="6f8YfqtHVp" role="2Oq$k0">
+                  <node concept="3A2sRY" id="6f8YfqtHVq" role="2Oq$k0">
+                    <ref role="3A2yKK" node="1zN1RIlreLm" resolve="imcop" />
+                  </node>
+                  <node concept="3TrEf2" id="6f8YfqtHVr" role="2OqNvi">
+                    <ref role="3Tt5mk" to="tpee:hwllgre" />
+                  </node>
+                </node>
+                <node concept="1mfA1w" id="6f8YfqtHVs" role="2OqNvi" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="391aah" id="6f8YfqtHr$" role="390Shn">
+          <property role="TrG5h" value="cls" />
+          <node concept="3Tqbb2" id="6f8YfqtHVc" role="390C7c">
+            <ref role="ehGHo" to="tpee:g7pOWCK" resolve="Classifier" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="AVZhu" id="2yOynGeSx8H" role="3ArX_J">
       <property role="TrG5h" value="baseMethodCall" />