From c3cf1e51113eca8ed18604ec2a7ee514bb6b6c1a Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Tue, 19 May 2020 19:17:35 +0300
Subject: [PATCH] Complete type inference for closure params wit inst macro,
 add tests, fix few minor issues

Related to MPSCR-20 & MPSCR-29.
---
 ...ins.mps.baseLanguage.closuresExt.types.mps |  708 ++++++---
 ...eLanguage.closuresExt.test.collections.mps | 1285 ++++++++++++++---
 ...ge.closuresExt.test.collections@tests.mps} |   33 +-
 3 files changed, 1675 insertions(+), 351 deletions(-)
 rename samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/{jetbrains.mps.baseLanguage.closuresExt.test.yield@tests.mps => jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps} (90%)

diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
index 53ee0fee..7eaf9214 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguage.closuresExt/models/jetbrains.mps.baseLanguage.closuresExt.types.mps
@@ -197,9 +197,6 @@
       <concept id="8713947027062024097" name="jetbrains.mps.logic.structure.LogicalItemValueExpression" flags="ng" index="1Ft4W6">
         <child id="8713947027062064784" name="logical" index="1FtiSR" />
       </concept>
-      <concept id="323863683626000488" name="jetbrains.mps.logic.structure.LogicalVariableRefExpression" flags="ng" index="3IkZw_">
-        <child id="323863683626065704" name="logical" index="3Ikct_" />
-      </concept>
     </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1179168000618" name="jetbrains.mps.lang.smodel.structure.Node_GetIndexInParentOperation" flags="nn" index="2bSWHS" />
@@ -400,14 +397,6 @@
         <reference id="6097203247182937177" name="template" index="3jbY9l" />
         <child id="6097203247182937145" name="input" index="3jbY8P" />
         <child id="6097203247182937143" name="logical" index="3jbY8V" />
-        <child id="6097203247185615297" name="arglist" index="3jhGvd" />
-      </concept>
-      <concept id="6097203247185614706" name="jetbrains.mps.lang.coderules.structure.ExpandMacroConstraintArglist" flags="ng" index="3jhG_Y">
-        <child id="6097203247185614855" name="binding" index="3jhGob" />
-      </concept>
-      <concept id="6097203247185614707" name="jetbrains.mps.lang.coderules.structure.ExpandMacroConstraintArgBinding" flags="ng" index="3jhG_Z">
-        <reference id="6097203247185614710" name="declaration" index="3jhG_U" />
-        <child id="6097203247185614708" name="argument" index="3jhG_S" />
       </concept>
       <concept id="6097203247184206287" name="jetbrains.mps.lang.coderules.structure.CallMacroConstraint" flags="ng" index="3jm4v3">
         <reference id="6097203247184207800" name="template" index="3jm46O" />
@@ -3996,7 +3985,7 @@
             </node>
             <node concept="3cpWs8" id="554EtBHBTfw" role="3cqZAp">
               <node concept="3cpWsn" id="554EtBHBTfx" role="3cpWs9">
-                <property role="TrG5h" value="bmd" />
+                <property role="TrG5h" value="mdecl" />
                 <node concept="3Tqbb2" id="554EtBHBTfy" role="1tU5fm">
                   <ref role="ehGHo" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                 </node>
@@ -4010,25 +3999,32 @@
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="554EtBHBTfA" role="3cqZAp">
-              <node concept="3cpWsn" id="554EtBHBTfB" role="3cpWs9">
-                <property role="TrG5h" value="paramDecl" />
-                <node concept="3Tqbb2" id="554EtBHBTfC" role="1tU5fm">
-                  <ref role="ehGHo" to="tpee:fz7vLUk" resolve="ParameterDeclaration" />
+            <node concept="3cpWs8" id="6yxoGiojaNK" role="3cqZAp">
+              <node concept="3cpWsn" id="6yxoGiojaNL" role="3cpWs9">
+                <property role="TrG5h" value="mtvds" />
+                <node concept="2I9FWS" id="6yxoGiojaNM" role="1tU5fm">
+                  <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
                 </node>
-                <node concept="1y4W85" id="554EtBHBTfD" role="33vP2m">
-                  <node concept="2OqwBi" id="554EtBHBW5A" role="1y58nS">
-                    <node concept="37vLTw" id="554EtBHBVVq" role="2Oq$k0">
-                      <ref role="3cqZAo" node="554EtBHBTMb" resolve="cl" />
-                    </node>
-                    <node concept="2bSWHS" id="554EtBHBWsl" role="2OqNvi" />
+                <node concept="2OqwBi" id="6yxoGiojaNN" role="33vP2m">
+                  <node concept="37vLTw" id="6yxoGiojbrd" role="2Oq$k0">
+                    <ref role="3cqZAo" node="554EtBHBTfx" resolve="mdecl" />
                   </node>
-                  <node concept="2OqwBi" id="554EtBHBTfF" role="1y566C">
-                    <node concept="3Tsc0h" id="554EtBHBTfG" role="2OqNvi">
-                      <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
-                    </node>
-                    <node concept="37vLTw" id="554EtBHBTfH" role="2Oq$k0">
-                      <ref role="3cqZAo" node="554EtBHBTfx" resolve="bmd" />
+                  <node concept="3Tsc0h" id="6yxoGiojaNP" role="2OqNvi">
+                    <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3cpWs8" id="6yxoGioj0v2" role="3cqZAp">
+              <node concept="3cpWsn" id="6yxoGioj0v3" role="3cpWs9">
+                <property role="TrG5h" value="noMethodTyArgs" />
+                <node concept="2I9FWS" id="6yxoGioj0v4" role="1tU5fm">
+                  <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
+                </node>
+                <node concept="2ShNRf" id="6yxoGioj0v5" role="33vP2m">
+                  <node concept="2T8Vx0" id="6yxoGioj0v6" role="2ShVmc">
+                    <node concept="2I9FWS" id="6yxoGioj0v7" role="2T96Bj">
+                      <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
                     </node>
                   </node>
                 </node>
@@ -4043,7 +4039,7 @@
                 </node>
                 <node concept="2OqwBi" id="554EtBHBXtA" role="33vP2m">
                   <node concept="37vLTw" id="554EtBHBX79" role="2Oq$k0">
-                    <ref role="3cqZAo" node="554EtBHBTfx" resolve="bmd" />
+                    <ref role="3cqZAo" node="554EtBHBTfx" resolve="mdecl" />
                   </node>
                   <node concept="2Xjw5R" id="554EtBHBYxp" role="2OqNvi">
                     <node concept="1xMEDy" id="554EtBHBYxr" role="1xVPHs">
@@ -4110,9 +4106,38 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3Aq93q" id="6yxoGioiZCg" role="1nLNMb">
+                  <property role="3ArMco" value="true" />
+                  <node concept="3I6sU6" id="6yxoGioiZCh" role="3Ip0Jz">
+                    <node concept="3I6s7M" id="6yxoGioiZIy" role="3I6sU7">
+                      <node concept="3Aqt3T" id="6yxoGioiZIx" role="3I6s78">
+                        <ref role="3AqCNq" to="kqnc:4btN1w5A2ZH" resolve="genDecl" />
+                        <node concept="37jhX" id="6yxoGioiZID" role="3AunhB">
+                          <node concept="37vLTw" id="6yxoGioiZIX" role="37jj2">
+                            <ref role="3cqZAo" node="554EtBHBTfx" resolve="mdecl" />
+                          </node>
+                        </node>
+                        <node concept="a7P8L" id="6yxoGioiZQZ" role="3AunhB">
+                          <ref role="a7OzE" node="6yxoGioiZQw" resolve="MethScheme" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
                 <node concept="3NuqgR" id="554EtBHCj3_" role="0Rg$4">
-                  <node concept="aZer4" id="554EtBHCDwE" role="3XD1gS">
-                    <property role="TrG5h" value="Param" />
+                  <node concept="aZer4" id="6yxoGioj12j" role="3XD1gS">
+                    <property role="TrG5h" value="MethParams" />
+                    <node concept="2OqwBi" id="6yxoGioj6t1" role="3gj$pD">
+                      <node concept="2OqwBi" id="6yxoGioj1lW" role="2Oq$k0">
+                        <node concept="37vLTw" id="6yxoGioj13j" role="2Oq$k0">
+                          <ref role="3cqZAo" node="554EtBHBTfx" resolve="mdecl" />
+                        </node>
+                        <node concept="3Tsc0h" id="6yxoGioj1Pt" role="2OqNvi">
+                          <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
+                        </node>
+                      </node>
+                      <node concept="34oBXx" id="6yxoGiojadb" role="2OqNvi" />
+                    </node>
                   </node>
                   <node concept="aZer4" id="554EtBHCj3A" role="3XD1gS">
                     <property role="TrG5h" value="ClosureParams" />
@@ -4145,107 +4170,169 @@
                   </node>
                   <node concept="32pEOW" id="554EtBHBWU6" role="3vLBG7" />
                 </node>
+                <node concept="3NuqgR" id="6yxoGioiZJ9" role="0Rg$4">
+                  <node concept="aZer4" id="6yxoGioiZJa" role="3XD1gS">
+                    <property role="TrG5h" value="InstMethSig" />
+                  </node>
+                  <node concept="aZer4" id="6yxoGioiZQw" role="3XD1gS">
+                    <property role="TrG5h" value="MethScheme" />
+                  </node>
+                  <node concept="aZer4" id="6yxoGiojas8" role="3XD1gS">
+                    <property role="TrG5h" value="MethTVs" />
+                    <node concept="2OqwBi" id="6yxoGiojfJs" role="3gj$pD">
+                      <node concept="37vLTw" id="6yxoGiojdI4" role="2Oq$k0">
+                        <ref role="3cqZAo" node="6yxoGiojaNL" resolve="mtvds" />
+                      </node>
+                      <node concept="34oBXx" id="6yxoGiojhXU" role="2OqNvi" />
+                    </node>
+                  </node>
+                  <node concept="32pEOW" id="6yxoGioiZP_" role="3vLBG7" />
+                </node>
                 <node concept="3xSepi" id="554EtBHBqIv" role="3xSepv">
                   <node concept="3Aq9E8" id="554EtBHBqIw" role="3xSepj">
                     <node concept="3I6sU6" id="554EtBHBqIx" role="3Ip0Jz">
                       <node concept="3IrJb3" id="554EtBHBSSU" role="3I6sU7">
                         <node concept="3clFbS" id="554EtBHBSSV" role="3IrJb0">
-                          <node concept="3cpWs8" id="554EtBHCbmG" role="3cqZAp">
-                            <node concept="3cpWsn" id="554EtBHCbmH" role="3cpWs9">
-                              <property role="TrG5h" value="subs" />
-                              <node concept="3uibUv" id="554EtBHCbmI" role="1tU5fm">
-                                <ref role="3uigEE" to="kqnc:6EY0p2w8VOq" resolve="TypeVarSubstitution" />
+                          <node concept="3Aqczg" id="6yxoGioiZUx" role="3cqZAp">
+                            <node concept="3jm4v3" id="6yxoGioiZUt" role="3Aqpz8">
+                              <ref role="3jm46O" to="kqnc:53tmmMs9igR" resolve="instantiateScheme" />
+                              <node concept="37vLTw" id="6yxoGioiZXl" role="3jicU7">
+                                <ref role="3cqZAo" node="554EtBHBTfx" resolve="mdecl" />
                               </node>
-                              <node concept="2ShNRf" id="554EtBHCbKW" role="33vP2m">
-                                <node concept="1pGfFk" id="554EtBHCbRY" role="2ShVmc">
-                                  <ref role="37wK5l" to="kqnc:6EY0p2wsoT6" resolve="TypeVarSubstitution" />
-                                  <node concept="37vLTw" id="554EtBHCci4" role="37wK5m">
-                                    <ref role="3cqZAo" node="554EtBHC4rc" resolve="ctvds" />
-                                  </node>
-                                </node>
+                              <node concept="37vLTw" id="6yxoGioj0BS" role="3jicU7">
+                                <ref role="3cqZAo" node="6yxoGioj0v3" resolve="noMethodTyArgs" />
+                              </node>
+                              <node concept="37vLTw" id="6yxoGioj0C2" role="3jicU7">
+                                <ref role="3cqZAo" node="554EtBHC4rc" resolve="ctvds" />
+                              </node>
+                              <node concept="a7P8L" id="6yxoGioiZWK" role="3jm6SO">
+                                <ref role="a7OzE" node="6yxoGioiZJa" resolve="InstMethSig" />
+                              </node>
+                              <node concept="a7P8L" id="6yxoGioiZWB" role="3jm6SO">
+                                <ref role="a7OzE" node="6yxoGioiZQw" resolve="MethScheme" />
+                              </node>
+                              <node concept="a7P8L" id="6yxoGioiZXa" role="3jm6SO">
+                                <ref role="a7OzE" node="554EtBHBWUn" resolve="ClsTyParams" />
                               </node>
                             </node>
                           </node>
-                          <node concept="1DcWWT" id="554EtBHCcHa" role="3cqZAp">
-                            <node concept="3clFbS" id="554EtBHCcHc" role="2LFqv$">
-                              <node concept="3clFbF" id="554EtBHCg5X" role="3cqZAp">
-                                <node concept="2OqwBi" id="554EtBHCgby" role="3clFbG">
-                                  <node concept="37vLTw" id="554EtBHCg5V" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="554EtBHCbmH" resolve="subs" />
-                                  </node>
-                                  <node concept="liA8E" id="554EtBHCgjA" role="2OqNvi">
-                                    <ref role="37wK5l" to="kqnc:6EY0p2w8YaM" resolve="substitute" />
-                                    <node concept="37vLTw" id="554EtBHCgKT" role="37wK5m">
-                                      <ref role="3cqZAo" node="554EtBHCcHd" resolve="tvd" />
-                                    </node>
-                                    <node concept="3IkZw_" id="554EtBHCgZz" role="37wK5m">
-                                      <node concept="a7P8L" id="554EtBHCgZy" role="3Ikct_">
-                                        <ref role="a7OzE" node="554EtBHBWUn" resolve="ClsTyParams" />
-                                        <node concept="2OqwBi" id="554EtBHCi82" role="3gCZO6">
-                                          <node concept="37vLTw" id="554EtBHChRD" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="554EtBHCcHd" resolve="tvd" />
-                                          </node>
-                                          <node concept="2bSWHS" id="554EtBHCiqf" role="2OqNvi" />
+                          <node concept="3clFbH" id="6yxoGiojjGg" role="3cqZAp" />
+                          <node concept="3Aqczg" id="6yxoGiojafk" role="3cqZAp">
+                            <node concept="3A8Hvi" id="6yxoGiojafl" role="3Aqpz8">
+                              <node concept="a7P8L" id="6yxoGiojafm" role="3A8wtg">
+                                <ref role="a7OzE" node="6yxoGioiZJa" resolve="InstMethSig" />
+                              </node>
+                              <node concept="ns1u0" id="6yxoGiojafn" role="3A8w4Q">
+                                <ref role="ns1xF" to="kqnc:ZJPHcupkiE" resolve="methodSign" />
+                                <node concept="nsMwS" id="6yxoGiojafo" role="ns1xD">
+                                  <ref role="nsMwP" to="kqnc:ZJPHcupkk3" resolve="params" />
+                                  <node concept="1nq8_$" id="6yxoGiojafp" role="nsMwV">
+                                    <node concept="37jhX" id="6yxoGiojarp" role="1nq8_t">
+                                      <node concept="1nq8_$" id="6yxoGiojaro" role="37jj2">
+                                        <node concept="a7P8L" id="6yxoGiojarn" role="1nq8_t">
+                                          <ref role="a7OzE" node="6yxoGioj12j" resolve="MethParams" />
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
-                              </node>
-                            </node>
-                            <node concept="3cpWsn" id="554EtBHCcHd" role="1Duv9x">
-                              <property role="TrG5h" value="tvd" />
-                              <node concept="3Tqbb2" id="554EtBHCcXe" role="1tU5fm">
-                                <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
-                              </node>
-                            </node>
-                            <node concept="37vLTw" id="554EtBHCe3U" role="1DdaDG">
-                              <ref role="3cqZAo" node="554EtBHC4rc" resolve="ctvds" />
-                            </node>
-                          </node>
-                          <node concept="3Aqczg" id="554EtBHBSSW" role="3cqZAp">
-                            <node concept="3jbYBd" id="554EtBHBqIz" role="3Aqpz8">
-                              <ref role="3jbY9l" to="kqnc:5itBwMau8m1" resolve="lift" />
-                              <node concept="a7P8L" id="554EtBHCDJv" role="3jbY8V">
-                                <ref role="a7OzE" node="554EtBHCDwE" resolve="Param" />
-                              </node>
-                              <node concept="3jhG_Y" id="554EtBHCisV" role="3jhGvd">
-                                <node concept="3jhG_Z" id="554EtBHCisX" role="3jhGob">
-                                  <ref role="3jhG_U" to="kqnc:5itBwMaLICh" resolve="substitution" />
-                                  <node concept="37vLTw" id="554EtBHCit1" role="3jhG_S">
-                                    <ref role="3cqZAo" node="554EtBHCbmH" resolve="subs" />
+                                <node concept="nsMwS" id="6yxoGiojafu" role="ns1xD">
+                                  <ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
+                                  <node concept="1nq8_$" id="6yxoGiojafv" role="nsMwV">
+                                    <node concept="a7P8L" id="6yxoGioji0J" role="1nq8_t">
+                                      <ref role="a7OzE" node="6yxoGiojas8" resolve="MethTVs" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="2OqwBi" id="554EtBHKMdH" role="3jbY8P">
-                                <node concept="37vLTw" id="554EtBHCit9" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="554EtBHBTfB" resolve="paramDecl" />
-                                </node>
-                                <node concept="3TrEf2" id="554EtBHKM$_" role="2OqNvi">
-                                  <ref role="3Tt5mk" to="tpee:4VkOLwjf83e" resolve="type" />
-                                </node>
-                              </node>
                             </node>
                           </node>
-                          <node concept="3Aqczg" id="554EtBHBSSX" role="3cqZAp">
-                            <node concept="3Aqt3T" id="554EtBHBqIB" role="3Aqpz8">
+                          <node concept="3Aqczg" id="6yxoGiojipn" role="3cqZAp">
+                            <node concept="3Aqt3T" id="6yxoGiojipo" role="3Aqpz8">
                               <ref role="3AqCNq" node="554EtBH_$_5" resolve="toFunctionalType" />
-                              <node concept="ns1u0" id="554EtBHCizs" role="3AunhB">
+                              <node concept="ns1u0" id="6yxoGiojipp" role="3AunhB">
                                 <ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
-                                <node concept="nsMwS" id="554EtBHCizu" role="ns1xD">
+                                <node concept="nsMwS" id="6yxoGiojipq" role="ns1xD">
                                   <ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
-                                  <node concept="1nq8_$" id="554EtBHCqON" role="nsMwV">
-                                    <node concept="a7P8L" id="554EtBHCqOM" role="1nq8_t">
+                                  <node concept="1nq8_$" id="6yxoGiojipr" role="nsMwV">
+                                    <node concept="a7P8L" id="6yxoGiojips" role="1nq8_t">
                                       <ref role="a7OzE" node="554EtBHCj3A" resolve="ClosureParams" />
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="a7P8L" id="554EtBHCDJC" role="3AunhB">
-                                <ref role="a7OzE" node="554EtBHCDwE" resolve="Param" />
+                              <node concept="a7P8L" id="6yxoGiojiAV" role="3AunhB">
+                                <ref role="a7OzE" node="6yxoGioj12j" resolve="MethParams" />
+                                <node concept="2OqwBi" id="6yxoGiojiUO" role="3gCZO6">
+                                  <node concept="37vLTw" id="6yxoGiojiG3" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="554EtBHBTMb" resolve="cl" />
+                                  </node>
+                                  <node concept="2bSWHS" id="6yxoGiojjdL" role="2OqNvi" />
+                                </node>
                               </node>
                             </node>
                           </node>
+                          <node concept="3SKdUt" id="6yxoGiojizP" role="3cqZAp">
+                            <node concept="1PaTwC" id="6yxoGiojizQ" role="1aUNEU">
+                              <node concept="3oM_SD" id="6yxoGiojizR" role="1PaTwD">
+                                <property role="3oM_SC" value="Some" />
+                              </node>
+                              <node concept="3oM_SD" id="6yxoGiojizS" role="1PaTwD">
+                                <property role="3oM_SC" value="type" />
+                              </node>
+                              <node concept="3oM_SD" id="6yxoGiojizT" role="1PaTwD">
+                                <property role="3oM_SC" value="variables" />
+                              </node>
+                              <node concept="3oM_SD" id="6yxoGiojizU" role="1PaTwD">
+                                <property role="3oM_SC" value="may" />
+                              </node>
+                              <node concept="3oM_SD" id="6yxoGiojizV" role="1PaTwD">
+                                <property role="3oM_SC" value="remain" />
+                              </node>
+                              <node concept="3oM_SD" id="6yxoGiojizW" role="1PaTwD">
+                                <property role="3oM_SC" value="unbound" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="1Dw8fO" id="6yxoGioji63" role="3cqZAp">
+                            <node concept="3clFbS" id="6yxoGioji64" role="2LFqv$">
+                              <node concept="3Aqczg" id="6yxoGioji65" role="3cqZAp">
+                                <node concept="3Aqt3T" id="6yxoGioji66" role="3Aqpz8">
+                                  <ref role="3AqCNq" to="kqnc:6N2bvv_5W0X" resolve="resolveVar" />
+                                  <node concept="a7P8L" id="6yxoGioji67" role="3AunhB">
+                                    <ref role="a7OzE" node="6yxoGiojas8" resolve="MethTVs" />
+                                    <node concept="37vLTw" id="6yxoGioji68" role="3gCZO6">
+                                      <ref role="3cqZAo" node="6yxoGioji69" resolve="i" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3cpWsn" id="6yxoGioji69" role="1Duv9x">
+                              <property role="TrG5h" value="i" />
+                              <node concept="10Oyi0" id="6yxoGioji6a" role="1tU5fm" />
+                              <node concept="3cmrfG" id="6yxoGioji6b" role="33vP2m">
+                                <property role="3cmrfH" value="0" />
+                              </node>
+                            </node>
+                            <node concept="3eOVzh" id="6yxoGioji6c" role="1Dwp0S">
+                              <node concept="2OqwBi" id="6yxoGioji6d" role="3uHU7w">
+                                <node concept="37vLTw" id="6yxoGioji6e" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="6yxoGiojaNL" resolve="mtvds" />
+                                </node>
+                                <node concept="34oBXx" id="6yxoGioji6f" role="2OqNvi" />
+                              </node>
+                              <node concept="37vLTw" id="6yxoGioji6g" role="3uHU7B">
+                                <ref role="3cqZAo" node="6yxoGioji69" resolve="i" />
+                              </node>
+                            </node>
+                            <node concept="2$rviw" id="6yxoGioji6h" role="1Dwrff">
+                              <node concept="37vLTw" id="6yxoGioji6i" role="2$L3a6">
+                                <ref role="3cqZAo" node="6yxoGioji69" resolve="i" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbH" id="6yxoGiojjD$" role="3cqZAp" />
                           <node concept="3Aqczg" id="554EtBHBSSY" role="3cqZAp">
                             <node concept="3Aqt3T" id="554EtBHBqIF" role="3Aqpz8">
                               <ref role="3AqCNq" to="kqnc:34$A1MfhdDv" resolve="typeOf" />
@@ -4328,7 +4415,7 @@
               </node>
               <node concept="3cpWs8" id="554EtBHCu9Z" role="3cqZAp">
                 <node concept="3cpWsn" id="554EtBHCua0" role="3cpWs9">
-                  <property role="TrG5h" value="bmd" />
+                  <property role="TrG5h" value="mdecl" />
                   <node concept="3Tqbb2" id="554EtBHCua1" role="1tU5fm">
                     <ref role="ehGHo" to="tpee:fzclF7W" resolve="BaseMethodDeclaration" />
                   </node>
@@ -4360,12 +4447,65 @@
                         <ref role="3TtcxE" to="tpee:fzclF7Y" resolve="parameter" />
                       </node>
                       <node concept="37vLTw" id="554EtBHCuae" role="2Oq$k0">
-                        <ref role="3cqZAo" node="554EtBHCua0" resolve="bmd" />
+                        <ref role="3cqZAo" node="554EtBHCua0" resolve="mdecl" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
+              <node concept="3clFbH" id="3ZtutR9ZDU_" role="3cqZAp" />
+              <node concept="3SKdUt" id="3ZtutR9ZDZy" role="3cqZAp">
+                <node concept="1PaTwC" id="3ZtutR9ZDZx" role="1aUNEU">
+                  <node concept="3oM_SD" id="3ZtutR9ZDWU" role="1PaTwD">
+                    <property role="3oM_SC" value="todo:" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZDY8" role="1PaTwD">
+                    <property role="3oM_SC" value="make" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZDYb" role="1PaTwD">
+                    <property role="3oM_SC" value="full" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZDYf" role="1PaTwD">
+                    <property role="3oM_SC" value="instantiation" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZDYk" role="1PaTwD">
+                    <property role="3oM_SC" value="analogously" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZDYq" role="1PaTwD">
+                    <property role="3oM_SC" value="to" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZE1q" role="1PaTwD">
+                    <property role="3oM_SC" value="a" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZE4u" role="1PaTwD">
+                    <property role="3oM_SC" value="rule" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZE2Z" role="1PaTwD">
+                    <property role="3oM_SC" value="above" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZE3Z" role="1PaTwD">
+                    <property role="3oM_SC" value="and" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZE4e" role="1PaTwD">
+                    <property role="3oM_SC" value="BaseMethodCall" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZDYD" role="1PaTwD">
+                    <property role="3oM_SC" value="rule" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZDZj" role="1PaTwD">
+                    <property role="3oM_SC" value="in" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZDYM" role="1PaTwD">
+                    <property role="3oM_SC" value="MethodCall" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZDYW" role="1PaTwD">
+                    <property role="3oM_SC" value="rule" />
+                  </node>
+                  <node concept="3oM_SD" id="3ZtutR9ZDZ7" role="1PaTwD">
+                    <property role="3oM_SC" value="table" />
+                  </node>
+                </node>
+              </node>
               <node concept="3clFbH" id="554EtBHCuau" role="3cqZAp" />
               <node concept="1nLNNL" id="554EtBHCuav" role="3cqZAp">
                 <node concept="1nLNMm" id="554EtBHCuaw" role="1nLNNK">
@@ -4532,13 +4672,27 @@
         </node>
         <node concept="3clFbH" id="554EtBHDCCK" role="3cqZAp" />
         <node concept="3clFbJ" id="554EtBHDt5b" role="3cqZAp">
-          <node concept="2OqwBi" id="554EtBHDt8o" role="3clFbw">
-            <node concept="37vLTw" id="554EtBHDt8p" role="2Oq$k0">
-              <ref role="3cqZAo" node="554EtBHDt55" resolve="inferenceContext" />
+          <node concept="1Wc70l" id="6yxoGioiVUL" role="3clFbw">
+            <node concept="3fqX7Q" id="6yxoGioiW0$" role="3uHU7w">
+              <node concept="2OqwBi" id="6yxoGioiW9R" role="3fr31v">
+                <node concept="37vLTw" id="6yxoGioiW1f" role="2Oq$k0">
+                  <ref role="3cqZAo" node="554EtBHDt55" resolve="inferenceContext" />
+                </node>
+                <node concept="1mIQ4w" id="6yxoGioiWg1" role="2OqNvi">
+                  <node concept="chp4Y" id="6yxoGioiWlR" role="cj9EA">
+                    <ref role="cht4Q" to="tpee:hxndl_i" resolve="IMethodCall" />
+                  </node>
+                </node>
+              </node>
             </node>
-            <node concept="1mIQ4w" id="554EtBHDt8q" role="2OqNvi">
-              <node concept="chp4Y" id="554EtBHDt8r" role="cj9EA">
-                <ref role="cht4Q" to="tpee:hqOqG0K" resolve="IOperation" />
+            <node concept="2OqwBi" id="554EtBHDt8o" role="3uHU7B">
+              <node concept="37vLTw" id="554EtBHDt8p" role="2Oq$k0">
+                <ref role="3cqZAo" node="554EtBHDt55" resolve="inferenceContext" />
+              </node>
+              <node concept="1mIQ4w" id="554EtBHDt8q" role="2OqNvi">
+                <node concept="chp4Y" id="554EtBHDt8r" role="cj9EA">
+                  <ref role="cht4Q" to="tpee:hqOqG0K" resolve="IOperation" />
+                </node>
               </node>
             </node>
           </node>
@@ -5167,10 +5321,10 @@
   <node concept="AVZre" id="554EtBH_$_2">
     <property role="3GE5qa" value="rule" />
     <property role="TrG5h" value="FunctionalClassifier" />
+    <ref role="2YbDB9" to="kqnc:4btN1w5Jfyx" resolve="Generics" />
     <node concept="1nLNMY" id="554EtBH_$Bk" role="1nK1Vg">
       <property role="TrG5h" value="toFunctional_classifier" />
       <node concept="3clFbS" id="554EtBH_$Bl" role="1nLNMH">
-        <node concept="3clFbH" id="554EtBH_$Bm" role="3cqZAp" />
         <node concept="3clFbJ" id="554EtBH_$Bn" role="3cqZAp">
           <node concept="3clFbS" id="554EtBH_$Bo" role="3clFbx">
             <node concept="3clFbH" id="554EtBH_$Bp" role="3cqZAp" />
@@ -5294,10 +5448,8 @@
                     <node concept="3cpWs8" id="554EtBH_$Cf" role="3cqZAp">
                       <node concept="3cpWsn" id="554EtBH_$Cg" role="3cpWs9">
                         <property role="TrG5h" value="paramTypes" />
-                        <node concept="_YKpA" id="554EtBH_$Ch" role="1tU5fm">
-                          <node concept="3Tqbb2" id="554EtBH_$Ci" role="_ZDj9">
-                            <ref role="ehGHo" to="tpee:fz3vP1H" resolve="Type" />
-                          </node>
+                        <node concept="2I9FWS" id="53tmmMtp8cM" role="1tU5fm">
+                          <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
                         </node>
                         <node concept="2OqwBi" id="554EtBH_$Cj" role="33vP2m">
                           <node concept="2OqwBi" id="554EtBH_$Ck" role="2Oq$k0">
@@ -5334,6 +5486,22 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3cpWs8" id="53tmmMtoZqi" role="3cqZAp">
+                      <node concept="3cpWsn" id="53tmmMtoZqj" role="3cpWs9">
+                        <property role="TrG5h" value="mtvds" />
+                        <node concept="2I9FWS" id="53tmmMtoZqk" role="1tU5fm">
+                          <ref role="2I9WkF" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
+                        </node>
+                        <node concept="2OqwBi" id="53tmmMtoZql" role="33vP2m">
+                          <node concept="37vLTw" id="53tmmMtp040" role="2Oq$k0">
+                            <ref role="3cqZAo" node="554EtBH_$C0" resolve="mdecl" />
+                          </node>
+                          <node concept="3Tsc0h" id="53tmmMtoZqn" role="2OqNvi">
+                            <ref role="3TtcxE" to="tpee:g96eVAe" resolve="typeVariableDeclaration" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                     <node concept="3cpWs8" id="554EtBH_$Cy" role="3cqZAp">
                       <node concept="3cpWsn" id="554EtBH_$Cz" role="3cpWs9">
                         <property role="TrG5h" value="ctvds" />
@@ -5350,6 +5518,21 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3cpWs8" id="53tmmMtoJCL" role="3cqZAp">
+                      <node concept="3cpWsn" id="53tmmMtoJCO" role="3cpWs9">
+                        <property role="TrG5h" value="noMethodTyArgs" />
+                        <node concept="2I9FWS" id="53tmmMtoJCJ" role="1tU5fm">
+                          <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
+                        </node>
+                        <node concept="2ShNRf" id="53tmmMtoK4m" role="33vP2m">
+                          <node concept="2T8Vx0" id="53tmmMtoKeN" role="2ShVmc">
+                            <node concept="2I9FWS" id="53tmmMtoKeP" role="2T96Bj">
+                              <ref role="2I9WkF" to="tpee:fz3vP1H" resolve="Type" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
                     <node concept="3clFbH" id="554EtBH_$CC" role="3cqZAp" />
                     <node concept="1nLNNL" id="554EtBH_$CD" role="3cqZAp">
                       <node concept="1nLNMm" id="554EtBH_$CE" role="1nLNNK">
@@ -5390,6 +5573,24 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="3Aq93q" id="53tmmMtoEoX" role="1nLNMb">
+                          <property role="3ArMco" value="true" />
+                          <node concept="3I6sU6" id="53tmmMtoEoY" role="3Ip0Jz">
+                            <node concept="3I6s7M" id="53tmmMtoEqm" role="3I6sU7">
+                              <node concept="3Aqt3T" id="53tmmMtoEql" role="3I6s78">
+                                <ref role="3AqCNq" to="kqnc:4btN1w5A2ZH" resolve="genDecl" />
+                                <node concept="37jhX" id="53tmmMtoEqt" role="3AunhB">
+                                  <node concept="37vLTw" id="53tmmMtoGXS" role="37jj2">
+                                    <ref role="3cqZAo" node="554EtBH_$C0" resolve="mdecl" />
+                                  </node>
+                                </node>
+                                <node concept="a7P8L" id="53tmmMtoICs" role="3AunhB">
+                                  <ref role="a7OzE" node="53tmmMtoEsC" resolve="MethScheme" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
                         <node concept="3NuqgR" id="554EtBH_$CW" role="0Rg$4">
                           <node concept="aZer4" id="554EtBH_$CX" role="3XD1gS">
                             <property role="TrG5h" value="ResultT" />
@@ -5397,9 +5598,6 @@
                           <node concept="aZer4" id="554EtBH_$CY" role="3XD1gS">
                             <property role="TrG5h" value="ClsT" />
                           </node>
-                          <node concept="32pEOW" id="554EtBH_$D0" role="3vLBG7" />
-                        </node>
-                        <node concept="3NuqgR" id="554EtBH_$D1" role="0Rg$4">
                           <node concept="aZer4" id="554EtBH_$D2" role="3XD1gS">
                             <property role="TrG5h" value="ClsTypeArgs" />
                             <node concept="2OqwBi" id="554EtBH_$D3" role="3gj$pD">
@@ -5409,86 +5607,235 @@
                               <node concept="34oBXx" id="554EtBH_$D5" role="2OqNvi" />
                             </node>
                           </node>
-                          <node concept="32pEOW" id="554EtBH_$D6" role="3vLBG7" />
+                          <node concept="32pEOW" id="554EtBH_$D0" role="3vLBG7" />
+                        </node>
+                        <node concept="3NuqgR" id="53tmmMtoEqH" role="0Rg$4">
+                          <node concept="aZer4" id="53tmmMtoEqI" role="3XD1gS">
+                            <property role="TrG5h" value="InstMethSig" />
+                          </node>
+                          <node concept="aZer4" id="53tmmMtoEsC" role="3XD1gS">
+                            <property role="TrG5h" value="MethScheme" />
+                          </node>
+                          <node concept="aZer4" id="53tmmMtoThW" role="3XD1gS">
+                            <property role="TrG5h" value="MethTVs" />
+                            <node concept="2OqwBi" id="53tmmMtoWw$" role="3gj$pD">
+                              <node concept="37vLTw" id="53tmmMtp24c" role="2Oq$k0">
+                                <ref role="3cqZAo" node="53tmmMtoZqj" resolve="mtvds" />
+                              </node>
+                              <node concept="34oBXx" id="53tmmMtoZpa" role="2OqNvi" />
+                            </node>
+                          </node>
+                          <node concept="32pEOW" id="53tmmMtoEs9" role="3vLBG7" />
+                        </node>
+                        <node concept="3NuqgR" id="53tmmMtoTau" role="0Rg$4">
+                          <node concept="aZer4" id="53tmmMtoLj2" role="3XD1gS">
+                            <property role="TrG5h" value="ParamsT" />
+                            <node concept="2OqwBi" id="53tmmMtoN8z" role="3gj$pD">
+                              <node concept="37vLTw" id="53tmmMtoLmx" role="2Oq$k0">
+                                <ref role="3cqZAo" node="554EtBH_$Cg" resolve="paramTypes" />
+                              </node>
+                              <node concept="34oBXx" id="53tmmMtoOMO" role="2OqNvi" />
+                            </node>
+                          </node>
+                          <node concept="aZer4" id="53tmmMtoLly" role="3XD1gS">
+                            <property role="TrG5h" value="RetT" />
+                          </node>
+                          <node concept="32pEOW" id="53tmmMtoTc6" role="3vLBG7" />
                         </node>
                         <node concept="3xSepi" id="554EtBH_$D7" role="3xSepv">
                           <node concept="3Aq9E8" id="554EtBH_$D8" role="3xSepj">
                             <node concept="3I6sU6" id="554EtBH_$D9" role="3Ip0Jz">
                               <node concept="3IrJb3" id="554EtBH_$Da" role="3I6sU7">
                                 <node concept="3clFbS" id="554EtBH_$Db" role="3IrJb0">
-                                  <node concept="3cpWs8" id="554EtBH_$Dc" role="3cqZAp">
-                                    <node concept="3cpWsn" id="554EtBH_$Dd" role="3cpWs9">
-                                      <property role="TrG5h" value="subs" />
-                                      <node concept="3uibUv" id="554EtBH_$De" role="1tU5fm">
-                                        <ref role="3uigEE" to="kqnc:6EY0p2w8VOq" resolve="TypeVarSubstitution" />
+                                  <node concept="3Aqczg" id="53tmmMtoIEH" role="3cqZAp">
+                                    <node concept="3jm4v3" id="53tmmMtoIED" role="3Aqpz8">
+                                      <ref role="3jm46O" to="kqnc:53tmmMs9igR" resolve="instantiateScheme" />
+                                      <node concept="37vLTw" id="53tmmMtoIIw" role="3jicU7">
+                                        <ref role="3cqZAo" node="554EtBH_$C0" resolve="mdecl" />
                                       </node>
-                                      <node concept="2ShNRf" id="554EtBH_$Df" role="33vP2m">
-                                        <node concept="1pGfFk" id="554EtBH_$Dg" role="2ShVmc">
-                                          <ref role="37wK5l" to="kqnc:6EY0p2wsoT6" resolve="TypeVarSubstitution" />
-                                          <node concept="37vLTw" id="554EtBH_$Dh" role="37wK5m">
-                                            <ref role="3cqZAo" node="554EtBH_$Cz" resolve="ctvds" />
-                                          </node>
-                                        </node>
+                                      <node concept="37vLTw" id="53tmmMtoKNr" role="3jicU7">
+                                        <ref role="3cqZAo" node="53tmmMtoJCO" resolve="noMethodTyArgs" />
+                                      </node>
+                                      <node concept="37vLTw" id="53tmmMtoKN_" role="3jicU7">
+                                        <ref role="3cqZAo" node="554EtBH_$Cz" resolve="ctvds" />
+                                      </node>
+                                      <node concept="a7P8L" id="53tmmMtoII3" role="3jm6SO">
+                                        <ref role="a7OzE" node="53tmmMtoEqI" resolve="InstMethSig" />
+                                      </node>
+                                      <node concept="a7P8L" id="53tmmMtoIIc" role="3jm6SO">
+                                        <ref role="a7OzE" node="53tmmMtoEsC" resolve="MethScheme" />
+                                      </node>
+                                      <node concept="a7P8L" id="53tmmMtoIIl" role="3jm6SO">
+                                        <ref role="a7OzE" node="554EtBH_$D2" resolve="ClsTypeArgs" />
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="1DcWWT" id="554EtBH_$Di" role="3cqZAp">
-                                    <node concept="3clFbS" id="554EtBH_$Dj" role="2LFqv$">
-                                      <node concept="3clFbF" id="554EtBH_$Dk" role="3cqZAp">
-                                        <node concept="2OqwBi" id="554EtBH_$Dl" role="3clFbG">
-                                          <node concept="37vLTw" id="554EtBH_$Dm" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="554EtBH_$Dd" resolve="subs" />
-                                          </node>
-                                          <node concept="liA8E" id="554EtBH_$Dn" role="2OqNvi">
-                                            <ref role="37wK5l" to="kqnc:6EY0p2w8YaM" resolve="substitute" />
-                                            <node concept="37vLTw" id="554EtBH_$Do" role="37wK5m">
-                                              <ref role="3cqZAo" node="554EtBH_$Du" resolve="tvd" />
+                                  <node concept="3clFbH" id="53tmmMtp7pH" role="3cqZAp" />
+                                  <node concept="3SKdUt" id="53tmmMtp7HN" role="3cqZAp">
+                                    <node concept="1PaTwC" id="53tmmMtp7HO" role="1aUNEU">
+                                      <node concept="3oM_SD" id="53tmmMtp7HP" role="1PaTwD">
+                                        <property role="3oM_SC" value="fixme:" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7JF" role="1PaTwD">
+                                        <property role="3oM_SC" value="leave" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7JI" role="1PaTwD">
+                                        <property role="3oM_SC" value="only" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7JM" role="1PaTwD">
+                                        <property role="3oM_SC" value="methodSign" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7JR" role="1PaTwD">
+                                        <property role="3oM_SC" value="term" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7JX" role="1PaTwD">
+                                        <property role="3oM_SC" value="or" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7K4" role="1PaTwD">
+                                        <property role="3oM_SC" value="trivially" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7Kl" role="1PaTwD">
+                                        <property role="3oM_SC" value="extend" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7Kc" role="1PaTwD">
+                                        <property role="3oM_SC" value="it?" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7Kv" role="1PaTwD">
+                                        <property role="3oM_SC" value="maybe" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7KE" role="1PaTwD">
+                                        <property role="3oM_SC" value="leave" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7KQ" role="1PaTwD">
+                                        <property role="3oM_SC" value="as" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7L3" role="1PaTwD">
+                                        <property role="3oM_SC" value="it" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7Lh" role="1PaTwD">
+                                        <property role="3oM_SC" value="is?" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3Aqczg" id="53tmmMtoLgU" role="3cqZAp">
+                                    <node concept="3A8Hvi" id="53tmmMtoLgO" role="3Aqpz8">
+                                      <node concept="a7P8L" id="53tmmMtoLiP" role="3A8wtg">
+                                        <ref role="a7OzE" node="53tmmMtoEqI" resolve="InstMethSig" />
+                                      </node>
+                                      <node concept="ns1u0" id="53tmmMtoLiW" role="3A8w4Q">
+                                        <ref role="ns1xF" to="kqnc:ZJPHcupkiE" resolve="methodSign" />
+                                        <node concept="nsMwS" id="53tmmMtoLiY" role="ns1xD">
+                                          <ref role="nsMwP" to="kqnc:ZJPHcupkk3" resolve="params" />
+                                          <node concept="1nq8_$" id="53tmmMtoOOH" role="nsMwV">
+                                            <node concept="a7P8L" id="53tmmMtoOOG" role="1nq8_t">
+                                              <ref role="a7OzE" node="53tmmMtoLj2" resolve="ParamsT" />
                                             </node>
-                                            <node concept="3IkZw_" id="554EtBH_$Dp" role="37wK5m">
-                                              <node concept="a7P8L" id="554EtBH_$Dq" role="3Ikct_">
-                                                <ref role="a7OzE" node="554EtBH_$D2" resolve="ClsTypeArgs" />
-                                                <node concept="2OqwBi" id="554EtBH_$Dr" role="3gCZO6">
-                                                  <node concept="37vLTw" id="554EtBH_$Ds" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="554EtBH_$Du" resolve="tvd" />
-                                                  </node>
-                                                  <node concept="2bSWHS" id="554EtBH_$Dt" role="2OqNvi" />
-                                                </node>
-                                              </node>
+                                          </node>
+                                        </node>
+                                        <node concept="nsMwS" id="53tmmMtoOOU" role="ns1xD">
+                                          <ref role="nsMwP" to="kqnc:ZJPHcupkk9" resolve="result" />
+                                          <node concept="1nq8_$" id="53tmmMtoOP2" role="nsMwV">
+                                            <node concept="a7P8L" id="53tmmMtoOP1" role="1nq8_t">
+                                              <ref role="a7OzE" node="53tmmMtoLly" resolve="RetT" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="nsMwS" id="53tmmMtoQOu" role="ns1xD">
+                                          <ref role="nsMwP" to="kqnc:ZJPHcupkiC" resolve="typeParams" />
+                                          <node concept="1nq8_$" id="53tmmMtp29d" role="nsMwV">
+                                            <node concept="a7P8L" id="53tmmMtp29c" role="1nq8_t">
+                                              <ref role="a7OzE" node="53tmmMtoThW" resolve="MethTVs" />
                                             </node>
                                           </node>
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="3cpWsn" id="554EtBH_$Du" role="1Duv9x">
-                                      <property role="TrG5h" value="tvd" />
-                                      <node concept="3Tqbb2" id="554EtBH_$Dv" role="1tU5fm">
-                                        <ref role="ehGHo" to="tpee:g96euPO" resolve="TypeVariableDeclaration" />
-                                      </node>
-                                    </node>
-                                    <node concept="37vLTw" id="554EtBH_$Dw" role="1DdaDG">
-                                      <ref role="3cqZAo" node="554EtBH_$Cz" resolve="ctvds" />
-                                    </node>
                                   </node>
-                                  <node concept="3Aqczg" id="554EtBH_$Dx" role="3cqZAp">
-                                    <node concept="3jm4v3" id="554EtBH_$Dy" role="3Aqpz8">
-                                      <ref role="3jm46O" to="fa4b:6$MmqWfmo8t" resolve="functionType" />
-                                      <node concept="37vLTw" id="554EtBH_$Dz" role="3jicU7">
-                                        <ref role="3cqZAo" node="554EtBH_$Cg" resolve="paramTypes" />
-                                      </node>
-                                      <node concept="2OqwBi" id="554EtBH_$D$" role="3jicU7">
-                                        <node concept="37vLTw" id="554EtBH_$D_" role="2Oq$k0">
-                                          <ref role="3cqZAo" node="554EtBH_$C0" resolve="mdecl" />
-                                        </node>
-                                        <node concept="3TrEf2" id="554EtBH_$DA" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="tpee:fzclF7X" resolve="returnType" />
-                                        </node>
-                                      </node>
-                                      <node concept="37vLTw" id="554EtBH_$DB" role="3jicU7">
-                                        <ref role="3cqZAo" node="554EtBH_$Dd" resolve="subs" />
-                                      </node>
-                                      <node concept="a7P8L" id="554EtBH_Hj5" role="3jm6SO">
+                                  <node concept="3Aqczg" id="53tmmMtoOSO" role="3cqZAp">
+                                    <node concept="3A8Hvi" id="53tmmMtoOSI" role="3Aqpz8">
+                                      <node concept="a7P8L" id="53tmmMtoOUU" role="3A8wtg">
                                         <ref role="a7OzE" node="554EtBH_$CX" resolve="ResultT" />
                                       </node>
+                                      <node concept="ns1u0" id="53tmmMtoOV1" role="3A8w4Q">
+                                        <ref role="ns1xF" to="fa4b:6$MmqWflYd6" resolve="function" />
+                                        <node concept="nsMwS" id="53tmmMtoOV3" role="ns1xD">
+                                          <ref role="nsMwP" to="fa4b:6$MmqWflYdw" resolve="params" />
+                                          <node concept="1nq8_$" id="53tmmMtoOV8" role="nsMwV">
+                                            <node concept="a7P8L" id="53tmmMtoOV7" role="1nq8_t">
+                                              <ref role="a7OzE" node="53tmmMtoLj2" resolve="ParamsT" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="nsMwS" id="53tmmMtoOVl" role="ns1xD">
+                                          <ref role="nsMwP" to="fa4b:6$MmqWflYdg" resolve="result" />
+                                          <node concept="1nq8_$" id="53tmmMtoOVt" role="nsMwV">
+                                            <node concept="a7P8L" id="53tmmMtoOVs" role="1nq8_t">
+                                              <ref role="a7OzE" node="53tmmMtoLly" resolve="RetT" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbH" id="53tmmMtpuE2" role="3cqZAp" />
+                                  <node concept="3SKdUt" id="53tmmMtp7t0" role="3cqZAp">
+                                    <node concept="1PaTwC" id="53tmmMtp7t1" role="1aUNEU">
+                                      <node concept="3oM_SD" id="53tmmMtp7t2" role="1PaTwD">
+                                        <property role="3oM_SC" value="Some" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7uK" role="1PaTwD">
+                                        <property role="3oM_SC" value="type" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7uN" role="1PaTwD">
+                                        <property role="3oM_SC" value="variables" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7uR" role="1PaTwD">
+                                        <property role="3oM_SC" value="may" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7uW" role="1PaTwD">
+                                        <property role="3oM_SC" value="remain" />
+                                      </node>
+                                      <node concept="3oM_SD" id="53tmmMtp7v2" role="1PaTwD">
+                                        <property role="3oM_SC" value="unbound" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="1Dw8fO" id="53tmmMtp2oO" role="3cqZAp">
+                                    <node concept="3clFbS" id="53tmmMtp2oQ" role="2LFqv$">
+                                      <node concept="3Aqczg" id="53tmmMtp7gJ" role="3cqZAp">
+                                        <node concept="3Aqt3T" id="53tmmMtp7gH" role="3Aqpz8">
+                                          <ref role="3AqCNq" to="kqnc:6N2bvv_5W0X" resolve="resolveVar" />
+                                          <node concept="a7P8L" id="53tmmMtp7ib" role="3AunhB">
+                                            <ref role="a7OzE" node="53tmmMtoThW" resolve="MethTVs" />
+                                            <node concept="37vLTw" id="53tmmMtp7iJ" role="3gCZO6">
+                                              <ref role="3cqZAo" node="53tmmMtp2oR" resolve="i" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3cpWsn" id="53tmmMtp2oR" role="1Duv9x">
+                                      <property role="TrG5h" value="i" />
+                                      <node concept="10Oyi0" id="53tmmMtp2qo" role="1tU5fm" />
+                                      <node concept="3cmrfG" id="53tmmMtp2q_" role="33vP2m">
+                                        <property role="3cmrfH" value="0" />
+                                      </node>
+                                    </node>
+                                    <node concept="3eOVzh" id="53tmmMtp3fo" role="1Dwp0S">
+                                      <node concept="2OqwBi" id="53tmmMtp6ew" role="3uHU7w">
+                                        <node concept="37vLTw" id="53tmmMtp3fD" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="53tmmMtoZqj" resolve="mtvds" />
+                                        </node>
+                                        <node concept="34oBXx" id="53tmmMtp7dt" role="2OqNvi" />
+                                      </node>
+                                      <node concept="37vLTw" id="53tmmMtp2qI" role="3uHU7B">
+                                        <ref role="3cqZAo" node="53tmmMtp2oR" resolve="i" />
+                                      </node>
+                                    </node>
+                                    <node concept="2$rviw" id="53tmmMtp7eI" role="1Dwrff">
+                                      <node concept="37vLTw" id="53tmmMtp7fO" role="2$L3a6">
+                                        <ref role="3cqZAo" node="53tmmMtp2oR" resolve="i" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -5519,7 +5866,6 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="554EtBH_$DQ" role="3cqZAp" />
           </node>
           <node concept="22lmx$" id="554EtBH_$DR" role="3clFbw">
             <node concept="2OqwBi" id="554EtBH_$DS" role="3uHU7w">
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps
index 968e4b76..0e3e9c99 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections.mps
@@ -25,6 +25,7 @@
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
@@ -35,6 +36,7 @@
       <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
         <child id="1070534760952" name="componentType" index="10Q1$1" />
       </concept>
+      <concept id="1068390468200" name="jetbrains.mps.baseLanguage.structure.FieldDeclaration" flags="ig" index="312cEg" />
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu">
         <child id="1165602531693" name="superclass" index="1zkMxy" />
       </concept>
@@ -107,6 +109,7 @@
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1200830824066" name="jetbrains.mps.baseLanguage.closures.structure.YieldStatement" flags="nn" index="2n63Yl">
@@ -141,6 +144,13 @@
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
+      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
+        <property id="709746936026609031" name="linkId" index="3V$3ak" />
+        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
+      </concept>
+      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
+        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
+      </concept>
     </language>
     <language id="c7fb639f-be78-4307-89b0-b5959c3fa8c8" name="jetbrains.mps.lang.text">
       <concept id="155656958578482948" name="jetbrains.mps.lang.text.structure.Word" flags="ng" index="3oM_SD">
@@ -906,7 +916,7 @@
     <node concept="3Tm1VV" id="4yZzE4kOzwS" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="554EtBHyc2K">
-    <property role="TrG5h" value="ClosureArgInference" />
+    <property role="TrG5h" value="ClosureParamInference" />
     <node concept="2tJIrI" id="554EtBHyc2L" role="jymVt" />
     <node concept="312cEu" id="554EtBHyc2M" role="jymVt">
       <property role="TrG5h" value="A" />
@@ -916,14 +926,14 @@
       <property role="TrG5h" value="B" />
       <node concept="3Tm1VV" id="554EtBHyc2P" role="1B3o_S" />
       <node concept="3uibUv" id="554EtBHyc2Q" role="1zkMxy">
-        <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureArgInference.A" />
+        <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureParamInference.A" />
       </node>
     </node>
     <node concept="312cEu" id="554EtBHyc2R" role="jymVt">
       <property role="TrG5h" value="C" />
       <node concept="3Tm1VV" id="554EtBHyc2S" role="1B3o_S" />
       <node concept="3uibUv" id="554EtBHyc2T" role="1zkMxy">
-        <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureArgInference.B" />
+        <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
       </node>
     </node>
     <node concept="2tJIrI" id="554EtBHzd8e" role="jymVt" />
@@ -950,7 +960,7 @@
         <node concept="16euLQ" id="554EtBHzdoM" role="16eVyc">
           <property role="TrG5h" value="T" />
           <node concept="3uibUv" id="554EtBHzd_l" role="3ztrMU">
-            <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureArgInference.B" />
+            <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
           </node>
         </node>
         <node concept="16euLQ" id="554EtBHzeB3" role="16eVyc">
@@ -986,7 +996,7 @@
       <node concept="16euLQ" id="554EtBHzfEx" role="16eVyc">
         <property role="TrG5h" value="Tw" />
         <node concept="3uibUv" id="554EtBHzfGz" role="3ztrMU">
-          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureArgInference.B" />
+          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
         </node>
       </node>
       <node concept="16euLQ" id="554EtBHzfGv" role="16eVyc">
@@ -1032,7 +1042,7 @@
       <node concept="16euLQ" id="554EtBHOWU_" role="16eVyc">
         <property role="TrG5h" value="Tx" />
         <node concept="3uibUv" id="554EtBHOWUA" role="3ztrMU">
-          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureArgInference.B" />
+          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
         </node>
       </node>
       <node concept="16euLQ" id="554EtBHOWUB" role="16eVyc">
@@ -1042,13 +1052,82 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="6yxoGioisG7" role="jymVt" />
+    <node concept="2tJIrI" id="6yxoGioiw2q" role="jymVt" />
+    <node concept="312cEu" id="6yxoGioixtS" role="jymVt">
+      <property role="TrG5h" value="PairBox" />
+      <node concept="312cEg" id="6yxoGioizVQ" role="jymVt">
+        <property role="TrG5h" value="el1" />
+        <node concept="3Tm6S6" id="6yxoGioizSy" role="1B3o_S" />
+        <node concept="16syzq" id="6yxoGioizVv" role="1tU5fm">
+          <ref role="16sUi3" node="6yxoGioiymc" resolve="TBox1" />
+        </node>
+      </node>
+      <node concept="312cEg" id="6yxoGioi$4o" role="jymVt">
+        <property role="TrG5h" value="el2" />
+        <node concept="3Tm6S6" id="6yxoGioi$4p" role="1B3o_S" />
+        <node concept="16syzq" id="6yxoGioi$7M" role="1tU5fm">
+          <ref role="16sUi3" node="6yxoGioiyIt" resolve="SBox1" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="6yxoGioi$8c" role="jymVt" />
+      <node concept="3clFb_" id="6yxoGioiyzB" role="jymVt">
+        <property role="TrG5h" value="processElement" />
+        <node concept="37vLTG" id="6yxoGioiy_C" role="3clF46">
+          <property role="TrG5h" value="worker" />
+          <node concept="3uibUv" id="6yxoGioiyBB" role="1tU5fm">
+            <ref role="3uigEE" node="554EtBHOWUr" resolve="ClosureParamInference.GGWorker" />
+            <node concept="16syzq" id="6yxoGioiyFR" role="11_B2D">
+              <ref role="16sUi3" node="6yxoGioiymc" resolve="TBox1" />
+            </node>
+            <node concept="16syzq" id="6yxoGioiyL6" role="11_B2D">
+              <ref role="16sUi3" node="6yxoGioiyIt" resolve="SBox1" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbS" id="6yxoGioiyzE" role="3clF47">
+          <node concept="3clFbF" id="6yxoGioizAr" role="3cqZAp">
+            <node concept="2OqwBi" id="6yxoGioizG2" role="3clFbG">
+              <node concept="37vLTw" id="6yxoGioizAq" role="2Oq$k0">
+                <ref role="3cqZAo" node="6yxoGioiy_C" resolve="worker" />
+              </node>
+              <node concept="liA8E" id="6yxoGioizNi" role="2OqNvi">
+                <ref role="37wK5l" node="554EtBHOWUs" resolve="doWork" />
+                <node concept="37vLTw" id="6yxoGioi$dT" role="37wK5m">
+                  <ref role="3cqZAo" node="6yxoGioizVQ" resolve="el1" />
+                </node>
+                <node concept="37vLTw" id="6yxoGioi$kt" role="37wK5m">
+                  <ref role="3cqZAo" node="6yxoGioi$4o" resolve="el2" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="6yxoGioiyx$" role="1B3o_S" />
+        <node concept="3cqZAl" id="6yxoGioiyzq" role="3clF45" />
+      </node>
+      <node concept="3Tm1VV" id="6yxoGioiwOy" role="1B3o_S" />
+      <node concept="16euLQ" id="6yxoGioiymc" role="16eVyc">
+        <property role="TrG5h" value="TBox1" />
+        <node concept="3uibUv" id="6yxoGioiyq0" role="3ztrMU">
+          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="6yxoGioiyIt" role="16eVyc">
+        <property role="TrG5h" value="SBox1" />
+        <node concept="16syzq" id="6yxoGioiyKQ" role="3ztrMU">
+          <ref role="16sUi3" node="6yxoGioiymc" resolve="TBox1" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="554EtBHzfuY" role="jymVt" />
+    <node concept="2tJIrI" id="6yxoGioiyML" role="jymVt" />
     <node concept="3clFb_" id="554EtBHzfep" role="jymVt">
       <property role="TrG5h" value="acceptIWorker" />
       <node concept="37vLTG" id="554EtBHzfil" role="3clF46">
         <property role="TrG5h" value="worker" />
         <node concept="3uibUv" id="554EtBHzfke" role="1tU5fm">
-          <ref role="3uigEE" node="4AYiKM_PGtX" resolve="ClosureArgInference.IWorker" />
+          <ref role="3uigEE" node="4AYiKM_PGtX" resolve="ClosureParamInference.IWorker" />
         </node>
       </node>
       <node concept="3clFbS" id="554EtBHzfes" role="3clF47" />
@@ -1060,12 +1139,12 @@
       <node concept="37vLTG" id="554EtBHzfSY" role="3clF46">
         <property role="TrG5h" value="worker" />
         <node concept="3uibUv" id="554EtBHzg03" role="1tU5fm">
-          <ref role="3uigEE" node="554EtBHzfwS" resolve="ClosureArgInference.GWorker" />
+          <ref role="3uigEE" node="554EtBHzfwS" resolve="ClosureParamInference.GWorker" />
           <node concept="3uibUv" id="554EtBHzg3G" role="11_B2D">
-            <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureArgInference.B" />
+            <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
           </node>
           <node concept="3uibUv" id="554EtBHzgeN" role="11_B2D">
-            <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureArgInference.C" />
+            <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
           </node>
         </node>
       </node>
@@ -1073,6 +1152,24 @@
       <node concept="3Tm1VV" id="554EtBHzfT1" role="1B3o_S" />
       <node concept="3cqZAl" id="554EtBHzfT2" role="3clF45" />
     </node>
+    <node concept="3clFb_" id="554EtBHU7RA" role="jymVt">
+      <property role="TrG5h" value="acceptGGWorker" />
+      <node concept="37vLTG" id="554EtBHU7RB" role="3clF46">
+        <property role="TrG5h" value="worker" />
+        <node concept="3uibUv" id="554EtBHU7RC" role="1tU5fm">
+          <ref role="3uigEE" node="554EtBHOWUr" resolve="ClosureParamInference.GGWorker" />
+          <node concept="3uibUv" id="554EtBHU7RD" role="11_B2D">
+            <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
+          </node>
+          <node concept="3uibUv" id="554EtBHU7RE" role="11_B2D">
+            <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
+          </node>
+        </node>
+      </node>
+      <node concept="3clFbS" id="554EtBHU7RF" role="3clF47" />
+      <node concept="3Tm1VV" id="554EtBHU7RG" role="1B3o_S" />
+      <node concept="3cqZAl" id="554EtBHU7RH" role="3clF45" />
+    </node>
     <node concept="3clFb_" id="554EtBHzeFe" role="jymVt">
       <property role="TrG5h" value="acceptT1" />
       <node concept="3clFbS" id="554EtBHzeFf" role="3clF47" />
@@ -1096,7 +1193,7 @@
       <node concept="16euLQ" id="554EtBHzeFm" role="16eVyc">
         <property role="TrG5h" value="T1" />
         <node concept="3uibUv" id="554EtBHzePi" role="3ztrMU">
-          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureArgInference.B" />
+          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
         </node>
       </node>
       <node concept="16euLQ" id="554EtBHzeFn" role="16eVyc">
@@ -1141,58 +1238,30 @@
     <node concept="2tJIrI" id="554EtBHyc37" role="jymVt" />
     <node concept="2tJIrI" id="554EtBHyc38" role="jymVt" />
     <node concept="3clFb_" id="554EtBHyc39" role="jymVt">
-      <property role="TrG5h" value="foo" />
-      <node concept="37vLTG" id="554EtBHyc3a" role="3clF46">
-        <property role="TrG5h" value="empts" />
-        <node concept="A3Dl8" id="554EtBHyc3b" role="1tU5fm" />
-      </node>
-      <node concept="37vLTG" id="554EtBHyc3c" role="3clF46">
-        <property role="TrG5h" value="xs" />
-        <node concept="A3Dl8" id="554EtBHyc3d" role="1tU5fm">
-          <node concept="3uibUv" id="554EtBHyc3e" role="A3Ik2">
-            <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureArgInference.A" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="554EtBHyc3f" role="3clF46">
-        <property role="TrG5h" value="ys" />
-        <node concept="A3Dl8" id="554EtBHyc3g" role="1tU5fm">
-          <node concept="3uibUv" id="554EtBHyc3h" role="A3Ik2">
-            <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureArgInference.B" />
-          </node>
-        </node>
-      </node>
-      <node concept="37vLTG" id="554EtBHyc3i" role="3clF46">
-        <property role="TrG5h" value="zs" />
-        <node concept="A3Dl8" id="554EtBHyc3j" role="1tU5fm">
-          <node concept="3uibUv" id="554EtBHyc3k" role="A3Ik2">
-            <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureArgInference.C" />
-          </node>
-        </node>
-      </node>
+      <property role="TrG5h" value="generics" />
       <node concept="37vLTG" id="554EtBHyc3l" role="3clF46">
         <property role="TrG5h" value="a" />
         <node concept="3uibUv" id="554EtBHyc3m" role="1tU5fm">
-          <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureArgInference.A" />
+          <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureParamInference.A" />
         </node>
       </node>
       <node concept="37vLTG" id="554EtBHyc3n" role="3clF46">
         <property role="TrG5h" value="b" />
         <node concept="3uibUv" id="554EtBHyc3o" role="1tU5fm">
-          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureArgInference.B" />
+          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
         </node>
       </node>
       <node concept="37vLTG" id="554EtBHyc3p" role="3clF46">
         <property role="TrG5h" value="c" />
         <node concept="3uibUv" id="554EtBHyc3q" role="1tU5fm">
-          <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureArgInference.C" />
+          <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
         </node>
       </node>
       <node concept="37vLTG" id="554EtBHyc3r" role="3clF46">
         <property role="TrG5h" value="arra" />
         <node concept="10Q1$e" id="554EtBHyc3s" role="1tU5fm">
           <node concept="3uibUv" id="554EtBHyc3t" role="10Q1$1">
-            <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureArgInference.A" />
+            <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureParamInference.A" />
           </node>
         </node>
       </node>
@@ -1200,7 +1269,7 @@
         <property role="TrG5h" value="arrb" />
         <node concept="10Q1$e" id="554EtBHyc3v" role="1tU5fm">
           <node concept="3uibUv" id="554EtBHyc3w" role="10Q1$1">
-            <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureArgInference.B" />
+            <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
           </node>
         </node>
       </node>
@@ -1208,43 +1277,11 @@
         <property role="TrG5h" value="arrc" />
         <node concept="10Q1$e" id="554EtBHyc3y" role="1tU5fm">
           <node concept="3uibUv" id="554EtBHyc3z" role="10Q1$1">
-            <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureArgInference.C" />
+            <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
           </node>
         </node>
       </node>
       <node concept="3clFbS" id="554EtBHyc3$" role="3clF47">
-        <node concept="3clFbH" id="554EtBHyc3_" role="3cqZAp" />
-        <node concept="3SKdUt" id="554EtBHyc3A" role="3cqZAp">
-          <node concept="1PaTwC" id="554EtBHyc3B" role="1aUNEU">
-            <node concept="3oM_SD" id="554EtBHyc3C" role="1PaTwD">
-              <property role="3oM_SC" value="void" />
-            </node>
-            <node concept="3oM_SD" id="554EtBHyc3D" role="1PaTwD">
-              <property role="3oM_SC" value="return" />
-            </node>
-            <node concept="3oM_SD" id="554EtBHyc3E" role="1PaTwD">
-              <property role="3oM_SC" value="&amp;" />
-            </node>
-            <node concept="3oM_SD" id="554EtBHyc3F" role="1PaTwD">
-              <property role="3oM_SC" value="yield" />
-            </node>
-          </node>
-        </node>
-        <node concept="3cpWs8" id="554EtBHyc3G" role="3cqZAp">
-          <node concept="3cpWsn" id="554EtBHyc3H" role="3cpWs9">
-            <property role="TrG5h" value="is1" />
-            <node concept="A3Dl8" id="554EtBHyc3I" role="1tU5fm" />
-            <node concept="2Sg_IR" id="554EtBHyc3J" role="33vP2m">
-              <node concept="1bVj0M" id="554EtBHyc3K" role="2SgG2M">
-                <node concept="3clFbS" id="554EtBHyc3L" role="1bW5cS" />
-              </node>
-            </node>
-            <node concept="1U20sH" id="554EtBHyc3M" role="lGtFl">
-              <property role="1U20sK" value="error" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="554EtBHyfhH" role="3cqZAp" />
         <node concept="3clFbH" id="554EtBHzgK0" role="3cqZAp" />
         <node concept="3clFbF" id="554EtBHzgAh" role="3cqZAp">
           <node concept="1rXfSq" id="554EtBHzgAf" role="3clFbG">
@@ -1273,6 +1310,49 @@
             </node>
           </node>
         </node>
+        <node concept="3SKdUt" id="3ZtutRa1_uX" role="3cqZAp">
+          <node concept="1PaTwC" id="3ZtutRa1_uY" role="1aUNEU">
+            <node concept="3oM_SD" id="3ZtutRa1_uZ" role="1PaTwD">
+              <property role="3oM_SC" value="here" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_VU" role="1PaTwD">
+              <property role="3oM_SC" value="both" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_W5" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_Wh" role="1PaTwD">
+              <property role="3oM_SC" value="vars" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_Wm" role="1PaTwD">
+              <property role="3oM_SC" value="can" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_W$" role="1PaTwD">
+              <property role="3oM_SC" value="be" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_WF" role="1PaTwD">
+              <property role="3oM_SC" value="resolved" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1AZA" role="1PaTwD">
+              <property role="3oM_SC" value="(inferred)" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_WV" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_X4" role="1PaTwD">
+              <property role="3oM_SC" value="B," />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_Xu" role="1PaTwD">
+              <property role="3oM_SC" value="so" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_XL" role="1PaTwD">
+              <property role="3oM_SC" value="it" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1_XX" role="1PaTwD">
+              <property role="3oM_SC" value="passes" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="554EtBHMN1W" role="3cqZAp">
           <node concept="1rXfSq" id="554EtBHMN1X" role="3clFbG">
             <ref role="37wK5l" node="554EtBHzfep" resolve="acceptIWorker" />
@@ -1286,9 +1366,6 @@
                     <node concept="37vLTw" id="554EtBHMNgJ" role="37vLTJ">
                       <ref role="3cqZAo" node="554EtBHMN26" resolve="itS" />
                     </node>
-                    <node concept="1U20sH" id="554EtBHMNtp" role="lGtFl">
-                      <property role="1U20sK" value="error" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -1307,7 +1384,7 @@
           <node concept="3cpWsn" id="554EtBHOuEE" role="3cpWs9">
             <property role="TrG5h" value="iw1" />
             <node concept="3uibUv" id="554EtBHOuEF" role="1tU5fm">
-              <ref role="3uigEE" node="4AYiKM_PGtX" resolve="ClosureArgInference.IWorker" />
+              <ref role="3uigEE" node="4AYiKM_PGtX" resolve="ClosureParamInference.IWorker" />
             </node>
             <node concept="1bVj0M" id="554EtBHOuZR" role="33vP2m">
               <node concept="3clFbS" id="554EtBHOuZS" role="1bW5cS">
@@ -1425,12 +1502,12 @@
           <node concept="3cpWsn" id="554EtBHOmWv" role="3cpWs9">
             <property role="TrG5h" value="gw1" />
             <node concept="3uibUv" id="554EtBHOmWx" role="1tU5fm">
-              <ref role="3uigEE" node="554EtBHzfwS" resolve="ClosureArgInference.GWorker" />
+              <ref role="3uigEE" node="554EtBHzfwS" resolve="ClosureParamInference.GWorker" />
               <node concept="3uibUv" id="554EtBHOnfm" role="11_B2D">
-                <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureArgInference.B" />
+                <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
               </node>
               <node concept="3uibUv" id="554EtBHOnkj" role="11_B2D">
-                <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureArgInference.C" />
+                <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
               </node>
             </node>
             <node concept="1bVj0M" id="554EtBHOnp6" role="33vP2m">
@@ -1486,106 +1563,183 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="554EtBHOYwc" role="3cqZAp" />
-        <node concept="3clFbH" id="554EtBHPoar" role="3cqZAp" />
-        <node concept="3clFbF" id="554EtBHOXSc" role="3cqZAp">
-          <node concept="1rXfSq" id="554EtBHOXSa" role="3clFbG">
-            <ref role="37wK5l" node="554EtBHzeFe" resolve="acceptT1" />
-            <node concept="1bVj0M" id="554EtBHOZqS" role="37wK5m">
-              <node concept="3clFbS" id="554EtBHOZqT" role="1bW5cS">
-                <node concept="3clFbF" id="554EtBHPpS9" role="3cqZAp">
-                  <node concept="37vLTI" id="554EtBHPq8b" role="3clFbG">
-                    <node concept="10Nm6u" id="554EtBHPqee" role="37vLTx" />
-                    <node concept="37vLTw" id="554EtBHPpY1" role="37vLTJ">
-                      <ref role="3cqZAo" node="554EtBHOZr0" resolve="itS" />
+        <node concept="3clFbH" id="554EtBHU5Nd" role="3cqZAp" />
+        <node concept="3SKdUt" id="5pvXCF9t1xs" role="3cqZAp">
+          <node concept="1PaTwC" id="5pvXCF9t1xt" role="1aUNEU">
+            <node concept="3oM_SD" id="5pvXCF9t1xu" role="1PaTwD">
+              <property role="3oM_SC" value="more" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2lk" role="1PaTwD">
+              <property role="3oM_SC" value="complex" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2lv" role="1PaTwD">
+              <property role="3oM_SC" value="inference:" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2lN" role="1PaTwD">
+              <property role="3oM_SC" value="both" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2m0" role="1PaTwD">
+              <property role="3oM_SC" value="classifier" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2mm" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2mt" role="1PaTwD">
+              <property role="3oM_SC" value="method" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2mH" role="1PaTwD">
+              <property role="3oM_SC" value="are" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2mQ" role="1PaTwD">
+              <property role="3oM_SC" value="generic," />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2n8" role="1PaTwD">
+              <property role="3oM_SC" value="with" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2nj" role="1PaTwD">
+              <property role="3oM_SC" value="dependent" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2nR" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="5pvXCF9t2oc" role="1PaTwD">
+              <property role="3oM_SC" value="vars" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="554EtBHU6Yx" role="3cqZAp">
+          <node concept="1rXfSq" id="554EtBHU6Yy" role="3clFbG">
+            <ref role="37wK5l" node="554EtBHU7RA" resolve="acceptGGWorker" />
+            <node concept="1bVj0M" id="554EtBHU6Yz" role="37wK5m">
+              <node concept="3clFbS" id="554EtBHU6Y$" role="1bW5cS">
+                <node concept="3clFbF" id="554EtBHU6Y_" role="3cqZAp">
+                  <node concept="37vLTI" id="554EtBHU6YA" role="3clFbG">
+                    <node concept="37vLTw" id="554EtBHU6YB" role="37vLTx">
+                      <ref role="3cqZAo" node="554EtBHU6YF" resolve="itC" />
+                    </node>
+                    <node concept="37vLTw" id="554EtBHU6YC" role="37vLTJ">
+                      <ref role="3cqZAo" node="554EtBHU6YD" resolve="itB" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="554EtBHOZr0" role="1bW2Oz">
-                <property role="TrG5h" value="itS" />
-                <node concept="2jxLKc" id="554EtBHOZr1" role="1tU5fm" />
+              <node concept="Rh6nW" id="554EtBHU6YD" role="1bW2Oz">
+                <property role="TrG5h" value="itB" />
+                <node concept="2jxLKc" id="554EtBHU6YE" role="1tU5fm" />
               </node>
-            </node>
-            <node concept="10Nm6u" id="554EtBHPqin" role="37wK5m" />
-          </node>
-        </node>
-        <node concept="3clFbF" id="554EtBHPqTW" role="3cqZAp">
-          <node concept="1rXfSq" id="554EtBHPqTX" role="3clFbG">
-            <ref role="37wK5l" node="554EtBHzeFe" resolve="acceptT1" />
-            <node concept="1bVj0M" id="554EtBHPqTY" role="37wK5m">
-              <node concept="3clFbS" id="554EtBHPqTZ" role="1bW5cS">
-                <node concept="3clFbF" id="554EtBHPqU0" role="3cqZAp">
-                  <node concept="37vLTI" id="554EtBHPqU1" role="3clFbG">
-                    <node concept="10Nm6u" id="554EtBHPqU2" role="37vLTx" />
-                    <node concept="37vLTw" id="554EtBHPqU3" role="37vLTJ">
-                      <ref role="3cqZAo" node="554EtBHPqU4" resolve="itS" />
-                    </node>
-                  </node>
-                </node>
+              <node concept="Rh6nW" id="554EtBHU6YF" role="1bW2Oz">
+                <property role="TrG5h" value="itC" />
+                <node concept="2jxLKc" id="554EtBHU6YG" role="1tU5fm" />
               </node>
-              <node concept="Rh6nW" id="554EtBHPqU4" role="1bW2Oz">
-                <property role="TrG5h" value="itS" />
-                <node concept="2jxLKc" id="554EtBHPqU5" role="1tU5fm" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="554EtBHPrxZ" role="37wK5m">
-              <ref role="3cqZAo" node="554EtBHyc3n" resolve="b" />
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="554EtBHPtmQ" role="3cqZAp">
-          <node concept="1rXfSq" id="554EtBHPtmR" role="3clFbG">
-            <ref role="37wK5l" node="554EtBHzeFe" resolve="acceptT1" />
-            <node concept="1bVj0M" id="554EtBHPtmS" role="37wK5m">
-              <node concept="3clFbS" id="554EtBHPtmT" role="1bW5cS">
-                <node concept="3clFbF" id="554EtBHPtmU" role="3cqZAp">
-                  <node concept="37vLTI" id="554EtBHPtmV" role="3clFbG">
-                    <node concept="37vLTw" id="554EtBHPsFt" role="37vLTJ">
-                      <ref role="3cqZAo" node="554EtBHyc3n" resolve="b" />
+        <node concept="3clFbF" id="554EtBHU6YH" role="3cqZAp">
+          <node concept="1rXfSq" id="554EtBHU6YI" role="3clFbG">
+            <ref role="37wK5l" node="554EtBHU7RA" resolve="acceptGGWorker" />
+            <node concept="1bVj0M" id="554EtBHU6YJ" role="37wK5m">
+              <node concept="3clFbS" id="554EtBHU6YK" role="1bW5cS">
+                <node concept="3clFbF" id="554EtBHU6YL" role="3cqZAp">
+                  <node concept="37vLTI" id="554EtBHU6YM" role="3clFbG">
+                    <node concept="37vLTw" id="554EtBHU6YN" role="37vLTx">
+                      <ref role="3cqZAo" node="554EtBHU6YQ" resolve="itB" />
                     </node>
-                    <node concept="37vLTw" id="554EtBHPsWS" role="37vLTx">
-                      <ref role="3cqZAo" node="554EtBHPtmW" resolve="itS" />
+                    <node concept="37vLTw" id="554EtBHU6YO" role="37vLTJ">
+                      <ref role="3cqZAo" node="554EtBHU6YS" resolve="itC" />
                     </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="Rh6nW" id="554EtBHPtmW" role="1bW2Oz">
-                <property role="TrG5h" value="itS" />
-                <node concept="2jxLKc" id="554EtBHPtmX" role="1tU5fm" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="554EtBHPtmY" role="37wK5m">
-              <ref role="3cqZAo" node="554EtBHyc3n" resolve="b" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="554EtBHPqWC" role="3cqZAp">
-          <node concept="1rXfSq" id="554EtBHPqWD" role="3clFbG">
-            <ref role="37wK5l" node="554EtBHzeFe" resolve="acceptT1" />
-            <node concept="1bVj0M" id="554EtBHPqWE" role="37wK5m">
-              <node concept="3clFbS" id="554EtBHPqWF" role="1bW5cS">
-                <node concept="3clFbF" id="554EtBHPqWG" role="3cqZAp">
-                  <node concept="37vLTI" id="554EtBHPqWH" role="3clFbG">
-                    <node concept="37vLTw" id="554EtBHPrQu" role="37vLTx">
-                      <ref role="3cqZAo" node="554EtBHyc3n" resolve="b" />
-                    </node>
-                    <node concept="37vLTw" id="554EtBHPqWJ" role="37vLTJ">
-                      <ref role="3cqZAo" node="554EtBHPqWK" resolve="itS" />
-                    </node>
-                    <node concept="1U20sH" id="554EtBHPtgp" role="lGtFl">
+                    <node concept="1U20sH" id="554EtBHU6YP" role="lGtFl">
                       <property role="1U20sK" value="error" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="Rh6nW" id="554EtBHPqWK" role="1bW2Oz">
-                <property role="TrG5h" value="itS" />
-                <node concept="2jxLKc" id="554EtBHPqWL" role="1tU5fm" />
+              <node concept="Rh6nW" id="554EtBHU6YQ" role="1bW2Oz">
+                <property role="TrG5h" value="itB" />
+                <node concept="2jxLKc" id="554EtBHU6YR" role="1tU5fm" />
+              </node>
+              <node concept="Rh6nW" id="554EtBHU6YS" role="1bW2Oz">
+                <property role="TrG5h" value="itC" />
+                <node concept="2jxLKc" id="554EtBHU6YT" role="1tU5fm" />
               </node>
             </node>
-            <node concept="37vLTw" id="554EtBHPrHT" role="37wK5m">
-              <ref role="3cqZAo" node="554EtBHyc3n" resolve="b" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="554EtBHU6YU" role="3cqZAp">
+          <node concept="3cpWsn" id="554EtBHU6YV" role="3cpWs9">
+            <property role="TrG5h" value="ggw1" />
+            <node concept="3uibUv" id="554EtBHU6YW" role="1tU5fm">
+              <ref role="3uigEE" node="554EtBHOWUr" resolve="ClosureParamInference.GGWorker" />
+              <node concept="3uibUv" id="554EtBHU6YX" role="11_B2D">
+                <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
+              </node>
+              <node concept="3uibUv" id="554EtBHU6YY" role="11_B2D">
+                <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
+              </node>
+            </node>
+            <node concept="1bVj0M" id="554EtBHU6YZ" role="33vP2m">
+              <node concept="3clFbS" id="554EtBHU6Z0" role="1bW5cS">
+                <node concept="3clFbF" id="554EtBHU6Z1" role="3cqZAp">
+                  <node concept="37vLTI" id="554EtBHU6Z2" role="3clFbG">
+                    <node concept="37vLTw" id="554EtBHU6Z3" role="37vLTx">
+                      <ref role="3cqZAo" node="554EtBHU6Z7" resolve="itC" />
+                    </node>
+                    <node concept="37vLTw" id="554EtBHU6Z4" role="37vLTJ">
+                      <ref role="3cqZAo" node="554EtBHU6Z5" resolve="itB" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="Rh6nW" id="554EtBHU6Z5" role="1bW2Oz">
+                <property role="TrG5h" value="itB" />
+                <node concept="2jxLKc" id="554EtBHU6Z6" role="1tU5fm" />
+              </node>
+              <node concept="Rh6nW" id="554EtBHU6Z7" role="1bW2Oz">
+                <property role="TrG5h" value="itC" />
+                <node concept="2jxLKc" id="554EtBHU6Z8" role="1tU5fm" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="554EtBHU6Z9" role="3cqZAp">
+          <node concept="37vLTI" id="554EtBHU6Za" role="3clFbG">
+            <node concept="37vLTw" id="554EtBHU6Zb" role="37vLTJ">
+              <ref role="3cqZAo" node="554EtBHU6YV" resolve="ggw1" />
+            </node>
+            <node concept="1bVj0M" id="554EtBHU6Zc" role="37vLTx">
+              <node concept="3clFbS" id="554EtBHU6Zd" role="1bW5cS">
+                <node concept="3clFbF" id="554EtBHU6Ze" role="3cqZAp">
+                  <node concept="37vLTI" id="554EtBHU6Zf" role="3clFbG">
+                    <node concept="37vLTw" id="554EtBHU6Zg" role="37vLTx">
+                      <ref role="3cqZAo" node="554EtBHU6Zk" resolve="itC" />
+                    </node>
+                    <node concept="37vLTw" id="554EtBHU6Zh" role="37vLTJ">
+                      <ref role="3cqZAo" node="554EtBHU6Zi" resolve="itB" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="Rh6nW" id="554EtBHU6Zi" role="1bW2Oz">
+                <property role="TrG5h" value="itB" />
+                <node concept="2jxLKc" id="554EtBHU6Zj" role="1tU5fm" />
+              </node>
+              <node concept="Rh6nW" id="554EtBHU6Zk" role="1bW2Oz">
+                <property role="TrG5h" value="itC" />
+                <node concept="2jxLKc" id="554EtBHU6Zl" role="1tU5fm" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="554EtBHU6tx" role="3cqZAp" />
+        <node concept="3SKdUt" id="554EtBHU5b$" role="3cqZAp">
+          <node concept="1PaTwC" id="554EtBHU5b_" role="1aUNEU">
+            <node concept="3oM_SD" id="554EtBHU5bA" role="1PaTwD">
+              <property role="3oM_SC" value="wrong" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHU5K_" role="1PaTwD">
+              <property role="3oM_SC" value="arg" />
+            </node>
+            <node concept="3oM_SD" id="554EtBHU5KK" role="1PaTwD">
+              <property role="3oM_SC" value="number" />
             </node>
           </node>
         </node>
@@ -1622,11 +1776,806 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="554EtBHyc7C" role="3cqZAp" />
       </node>
       <node concept="3Tm1VV" id="554EtBHyc7D" role="1B3o_S" />
       <node concept="3cqZAl" id="554EtBHyc7E" role="3clF45" />
     </node>
+    <node concept="2tJIrI" id="6yxoGioiBc4" role="jymVt" />
+    <node concept="3clFb_" id="6yxoGioiBpr" role="jymVt">
+      <property role="TrG5h" value="stranger" />
+      <node concept="37vLTG" id="6yxoGioiBps" role="3clF46">
+        <property role="TrG5h" value="a" />
+        <node concept="3uibUv" id="6yxoGioiBpt" role="1tU5fm">
+          <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureParamInference.A" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yxoGioiBpu" role="3clF46">
+        <property role="TrG5h" value="b" />
+        <node concept="3uibUv" id="6yxoGioiBpv" role="1tU5fm">
+          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yxoGioiBpw" role="3clF46">
+        <property role="TrG5h" value="c" />
+        <node concept="3uibUv" id="6yxoGioiBpx" role="1tU5fm">
+          <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="6yxoGioiBpF" role="3clF47">
+        <node concept="3SKdUt" id="6yxoGioiBsu" role="3cqZAp">
+          <node concept="1PaTwC" id="6yxoGioiBsv" role="1aUNEU">
+            <node concept="3oM_SD" id="6yxoGioiBsw" role="1PaTwD">
+              <property role="3oM_SC" value="Other" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiBsx" role="1PaTwD">
+              <property role="3oM_SC" value="more" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiBsy" role="1PaTwD">
+              <property role="3oM_SC" value="complex" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZzXM" role="1PaTwD">
+              <property role="3oM_SC" value="(&amp;" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZzYr" role="1PaTwD">
+              <property role="3oM_SC" value="stranger" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZzZl" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZzZw" role="1PaTwD">
+              <property role="3oM_SC" value="less" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZzZG" role="1PaTwD">
+              <property role="3oM_SC" value="definite)" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDk7" role="1PaTwD">
+              <property role="3oM_SC" value="examples" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="3ZtutR9ZD8T" role="3cqZAp">
+          <node concept="1PaTwC" id="3ZtutR9ZD8U" role="1aUNEU">
+            <node concept="3oM_SD" id="3ZtutR9ZDkr" role="1PaTwD">
+              <property role="3oM_SC" value="where" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCY2" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDuZ" role="1PaTwD">
+              <property role="3oM_SC" value="inference" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDD8" role="1PaTwD">
+              <property role="3oM_SC" value="can" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDjj" role="1PaTwD">
+              <property role="3oM_SC" value="return" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDjA" role="1PaTwD">
+              <property role="3oM_SC" value="false" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1D4A" role="1PaTwD">
+              <property role="3oM_SC" value="positives" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="3ZtutRa1D4Y" role="3cqZAp">
+          <node concept="1PaTwC" id="3ZtutRa1D4X" role="1aUNEU">
+            <node concept="3oM_SD" id="3ZtutRa1D4W" role="1PaTwD">
+              <property role="3oM_SC" value="(because" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1D4f" role="1PaTwD">
+              <property role="3oM_SC" value="it" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1D2z" role="1PaTwD">
+              <property role="3oM_SC" value="doesn't" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1D2P" role="1PaTwD">
+              <property role="3oM_SC" value="guarantee" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1D3g" role="1PaTwD">
+              <property role="3oM_SC" value="to" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1D3s" role="1PaTwD">
+              <property role="3oM_SC" value="find" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1DhV" role="1PaTwD">
+              <property role="3oM_SC" value="the" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1DiY" role="1PaTwD">
+              <property role="3oM_SC" value="best" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1Dj8" role="1PaTwD">
+              <property role="3oM_SC" value="or" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1Djr" role="1PaTwD">
+              <property role="3oM_SC" value="even" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1DjJ" role="1PaTwD">
+              <property role="3oM_SC" value="any" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1Dir" role="1PaTwD">
+              <property role="3oM_SC" value="solution)," />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="3ZtutR9ZDJq" role="3cqZAp">
+          <node concept="1PaTwC" id="3ZtutR9ZDJp" role="1aUNEU">
+            <node concept="3oM_SD" id="3ZtutR9ZDJo" role="1PaTwD">
+              <property role="3oM_SC" value="but" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDHb" role="1PaTwD">
+              <property role="3oM_SC" value="no" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDHB" role="1PaTwD">
+              <property role="3oM_SC" value="false" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDHO" role="1PaTwD">
+              <property role="3oM_SC" value="negatives," />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDIa" role="1PaTwD">
+              <property role="3oM_SC" value="because" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa1DiG" role="1PaTwD">
+              <property role="3oM_SC" value="it" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDIp" role="1PaTwD">
+              <property role="3oM_SC" value="shouldn't" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDG7" role="1PaTwD">
+              <property role="3oM_SC" value="miss" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZDGi" role="1PaTwD">
+              <property role="3oM_SC" value="errors." />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6yxoGiolck3" role="3cqZAp" />
+        <node concept="3clFbF" id="6yxoGioiBsB" role="3cqZAp">
+          <node concept="1rXfSq" id="6yxoGioiBsC" role="3clFbG">
+            <ref role="37wK5l" node="554EtBHzeFe" resolve="acceptT1" />
+            <node concept="1bVj0M" id="6yxoGioiBsD" role="37wK5m">
+              <node concept="3clFbS" id="6yxoGioiBsE" role="1bW5cS">
+                <node concept="3clFbF" id="6yxoGioiBsF" role="3cqZAp">
+                  <node concept="37vLTI" id="6yxoGioiBsG" role="3clFbG">
+                    <node concept="10Nm6u" id="6yxoGioiBsH" role="37vLTx" />
+                    <node concept="37vLTw" id="6yxoGioiBsI" role="37vLTJ">
+                      <ref role="3cqZAo" node="6yxoGioiBsJ" resolve="itS" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="Rh6nW" id="6yxoGioiBsJ" role="1bW2Oz">
+                <property role="TrG5h" value="itS" />
+                <node concept="2jxLKc" id="6yxoGioiBsK" role="1tU5fm" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6yxoGioiBsL" role="37wK5m">
+              <ref role="3cqZAo" node="6yxoGioiBpu" resolve="b" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6yxoGioiBsM" role="3cqZAp">
+          <node concept="1rXfSq" id="6yxoGioiBsN" role="3clFbG">
+            <ref role="37wK5l" node="554EtBHzeFe" resolve="acceptT1" />
+            <node concept="1bVj0M" id="6yxoGioiBsO" role="37wK5m">
+              <node concept="3clFbS" id="6yxoGioiBsP" role="1bW5cS">
+                <node concept="3clFbF" id="6yxoGioiBsQ" role="3cqZAp">
+                  <node concept="37vLTI" id="6yxoGioiBsR" role="3clFbG">
+                    <node concept="37vLTw" id="6yxoGioiBsS" role="37vLTJ">
+                      <ref role="3cqZAo" node="6yxoGioiBpu" resolve="b" />
+                    </node>
+                    <node concept="37vLTw" id="6yxoGioiBsT" role="37vLTx">
+                      <ref role="3cqZAo" node="6yxoGioiBsU" resolve="itS" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="Rh6nW" id="6yxoGioiBsU" role="1bW2Oz">
+                <property role="TrG5h" value="itS" />
+                <node concept="2jxLKc" id="6yxoGioiBsV" role="1tU5fm" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6yxoGioiBsW" role="37wK5m">
+              <ref role="3cqZAo" node="6yxoGioiBpu" resolve="b" />
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="3ZtutR9ZCxD" role="3cqZAp">
+          <node concept="1PaTwC" id="3ZtutR9ZCxE" role="1aUNEU">
+            <node concept="3oM_SD" id="3ZtutR9ZCxF" role="1PaTwD">
+              <property role="3oM_SC" value="while" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxG" role="1PaTwD">
+              <property role="3oM_SC" value="there's" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxH" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxI" role="1PaTwD">
+              <property role="3oM_SC" value="solution," />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxJ" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxK" role="1PaTwD">
+              <property role="3oM_SC" value="inference" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxL" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxM" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxN" role="1PaTwD">
+              <property role="3oM_SC" value="designed" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxO" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxP" role="1PaTwD">
+              <property role="3oM_SC" value="such" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxQ" role="1PaTwD">
+              <property role="3oM_SC" value="full" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZCxR" role="1PaTwD">
+              <property role="3oM_SC" value="inference" />
+            </node>
+          </node>
+        </node>
+        <node concept="1X3_iC" id="3ZtutR9ZCJU" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3clFbF" id="6yxoGioiBsX" role="8Wnug">
+            <node concept="1rXfSq" id="6yxoGioiBsY" role="3clFbG">
+              <ref role="37wK5l" node="554EtBHzeFe" resolve="acceptT1" />
+              <node concept="1bVj0M" id="6yxoGioiBsZ" role="37wK5m">
+                <node concept="3clFbS" id="6yxoGioiBt0" role="1bW5cS">
+                  <node concept="3clFbF" id="6yxoGioiBt1" role="3cqZAp">
+                    <node concept="37vLTI" id="6yxoGioiBt2" role="3clFbG">
+                      <node concept="10Nm6u" id="6yxoGioiBt3" role="37vLTx" />
+                      <node concept="37vLTw" id="6yxoGioiBt4" role="37vLTJ">
+                        <ref role="3cqZAo" node="6yxoGioiBt5" resolve="itS" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="6yxoGioiBt5" role="1bW2Oz">
+                  <property role="TrG5h" value="itS" />
+                  <node concept="2jxLKc" id="6yxoGioiBt6" role="1tU5fm" />
+                </node>
+              </node>
+              <node concept="10Nm6u" id="6yxoGioiBt7" role="37wK5m">
+                <node concept="1U20sH" id="3ZtutR9ZzuF" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="3ZtutR9ZBzu" role="3cqZAp">
+          <node concept="1PaTwC" id="3ZtutR9ZBzv" role="1aUNEU">
+            <node concept="3oM_SD" id="3ZtutR9ZBzw" role="1PaTwD">
+              <property role="3oM_SC" value="while" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBOJ" role="1PaTwD">
+              <property role="3oM_SC" value="there's" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBOU" role="1PaTwD">
+              <property role="3oM_SC" value="a" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBP6" role="1PaTwD">
+              <property role="3oM_SC" value="solution," />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBPz" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBPD" role="1PaTwD">
+              <property role="3oM_SC" value="inference" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBQp" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBQx" role="1PaTwD">
+              <property role="3oM_SC" value="not" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBQE" role="1PaTwD">
+              <property role="3oM_SC" value="designed" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBRc" role="1PaTwD">
+              <property role="3oM_SC" value="for" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBS0" role="1PaTwD">
+              <property role="3oM_SC" value="such" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBSk" role="1PaTwD">
+              <property role="3oM_SC" value="full" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutR9ZBSx" role="1PaTwD">
+              <property role="3oM_SC" value="inference" />
+            </node>
+          </node>
+        </node>
+        <node concept="1X3_iC" id="3ZtutR9ZBSR" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3clFbF" id="6yxoGioiBt8" role="8Wnug">
+            <node concept="1rXfSq" id="6yxoGioiBt9" role="3clFbG">
+              <ref role="37wK5l" node="554EtBHzeFe" resolve="acceptT1" />
+              <node concept="1bVj0M" id="6yxoGioiBta" role="37wK5m">
+                <node concept="3clFbS" id="6yxoGioiBtb" role="1bW5cS">
+                  <node concept="3clFbF" id="6yxoGioiBtc" role="3cqZAp">
+                    <node concept="37vLTI" id="6yxoGioiBtd" role="3clFbG">
+                      <node concept="37vLTw" id="6yxoGioiBte" role="37vLTJ">
+                        <ref role="3cqZAo" node="6yxoGioiBpu" resolve="b" />
+                      </node>
+                      <node concept="37vLTw" id="6yxoGioiBtf" role="37vLTx">
+                        <ref role="3cqZAo" node="6yxoGioiBtg" resolve="itS" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="6yxoGioiBtg" role="1bW2Oz">
+                  <property role="TrG5h" value="itS" />
+                  <node concept="2jxLKc" id="6yxoGioiBth" role="1tU5fm" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="6yxoGioiBti" role="37wK5m">
+                <ref role="3cqZAo" node="6yxoGioiBpw" resolve="c" />
+                <node concept="1U20sH" id="3ZtutR9ZzSm" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6yxoGioiBtj" role="3cqZAp">
+          <node concept="1rXfSq" id="6yxoGioiBtk" role="3clFbG">
+            <ref role="37wK5l" node="554EtBHzeFe" resolve="acceptT1" />
+            <node concept="1bVj0M" id="6yxoGioiBtl" role="37wK5m">
+              <node concept="3clFbS" id="6yxoGioiBtm" role="1bW5cS">
+                <node concept="3clFbF" id="6yxoGioiBtn" role="3cqZAp">
+                  <node concept="37vLTI" id="6yxoGioiBto" role="3clFbG">
+                    <node concept="37vLTw" id="6yxoGioiBtp" role="37vLTx">
+                      <ref role="3cqZAo" node="6yxoGioiBpu" resolve="b" />
+                    </node>
+                    <node concept="37vLTw" id="6yxoGioiBtq" role="37vLTJ">
+                      <ref role="3cqZAo" node="6yxoGioiBts" resolve="itS" />
+                    </node>
+                    <node concept="1U20sH" id="6yxoGioiBtr" role="lGtFl">
+                      <property role="1U20sK" value="error" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="Rh6nW" id="6yxoGioiBts" role="1bW2Oz">
+                <property role="TrG5h" value="itS" />
+                <node concept="2jxLKc" id="6yxoGioiBtt" role="1tU5fm" />
+              </node>
+            </node>
+            <node concept="37vLTw" id="6yxoGioiBtu" role="37wK5m">
+              <ref role="3cqZAo" node="6yxoGioiBpu" resolve="b" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6yxoGioiBtN" role="1B3o_S" />
+      <node concept="3cqZAl" id="6yxoGioiBtO" role="3clF45" />
+    </node>
+    <node concept="2tJIrI" id="6yxoGioiBiJ" role="jymVt" />
+    <node concept="3clFb_" id="6yxoGioiMym" role="jymVt">
+      <property role="TrG5h" value="genericCollection" />
+      <node concept="37vLTG" id="6yxoGioiNsG" role="3clF46">
+        <property role="TrG5h" value="box" />
+        <node concept="3uibUv" id="6yxoGioiOgU" role="1tU5fm">
+          <ref role="3uigEE" node="6yxoGioixtS" resolve="ClosureParamInference.PairBox" />
+          <node concept="3uibUv" id="6yxoGioiOkZ" role="11_B2D">
+            <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
+          </node>
+          <node concept="3uibUv" id="6yxoGioiOri" role="11_B2D">
+            <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yxoGioiOCZ" role="3clF46">
+        <property role="TrG5h" value="a" />
+        <node concept="3uibUv" id="6yxoGioiOD0" role="1tU5fm">
+          <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureParamInference.A" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yxoGioiOD1" role="3clF46">
+        <property role="TrG5h" value="b" />
+        <node concept="3uibUv" id="6yxoGioiOD2" role="1tU5fm">
+          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="6yxoGioiOD3" role="3clF46">
+        <property role="TrG5h" value="c" />
+        <node concept="3uibUv" id="6yxoGioiOD4" role="1tU5fm">
+          <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="6yxoGioiMyp" role="3clF47">
+        <node concept="3SKdUt" id="6yxoGioiR8Z" role="3cqZAp">
+          <node concept="1PaTwC" id="6yxoGioiR90" role="1aUNEU">
+            <node concept="3oM_SD" id="6yxoGioiR91" role="1PaTwD">
+              <property role="3oM_SC" value="Checks" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRg4" role="1PaTwD">
+              <property role="3oM_SC" value="that" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRgf" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRhj" role="1PaTwD">
+              <property role="3oM_SC" value="var" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRhC" role="1PaTwD">
+              <property role="3oM_SC" value="substitutions" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRhQ" role="1PaTwD">
+              <property role="3oM_SC" value="from" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRi5" role="1PaTwD">
+              <property role="3oM_SC" value="context" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRil" role="1PaTwD">
+              <property role="3oM_SC" value="are" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRjz" role="1PaTwD">
+              <property role="3oM_SC" value="taken" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRrr" role="1PaTwD">
+              <property role="3oM_SC" value="into" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRsv" role="1PaTwD">
+              <property role="3oM_SC" value="account" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRsN" role="1PaTwD">
+              <property role="3oM_SC" value="and" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRt0" role="1PaTwD">
+              <property role="3oM_SC" value="properly" />
+            </node>
+            <node concept="3oM_SD" id="6yxoGioiRtm" role="1PaTwD">
+              <property role="3oM_SC" value="handled" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6yxoGioiSbT" role="3cqZAp" />
+        <node concept="3clFbH" id="3ZtutRa2EWS" role="3cqZAp" />
+        <node concept="3cpWs8" id="6yxoGioiQwH" role="3cqZAp">
+          <node concept="3cpWsn" id="6yxoGioiQwI" role="3cpWs9">
+            <property role="TrG5h" value="ggw1" />
+            <node concept="3uibUv" id="6yxoGioiQwJ" role="1tU5fm">
+              <ref role="3uigEE" node="554EtBHOWUr" resolve="ClosureParamInference.GGWorker" />
+              <node concept="3uibUv" id="6yxoGioiQwK" role="11_B2D">
+                <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
+              </node>
+              <node concept="3uibUv" id="6yxoGioiQwL" role="11_B2D">
+                <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
+              </node>
+            </node>
+            <node concept="1bVj0M" id="6yxoGioiQwM" role="33vP2m">
+              <node concept="3clFbS" id="6yxoGioiQwN" role="1bW5cS">
+                <node concept="3clFbF" id="6yxoGioiQwO" role="3cqZAp">
+                  <node concept="37vLTI" id="6yxoGioiQwP" role="3clFbG">
+                    <node concept="37vLTw" id="6yxoGioiQwQ" role="37vLTx">
+                      <ref role="3cqZAo" node="6yxoGioiQwU" resolve="itC" />
+                    </node>
+                    <node concept="37vLTw" id="6yxoGioiQwR" role="37vLTJ">
+                      <ref role="3cqZAo" node="6yxoGioiQwS" resolve="itB" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="Rh6nW" id="6yxoGioiQwS" role="1bW2Oz">
+                <property role="TrG5h" value="itB" />
+                <node concept="2jxLKc" id="6yxoGioiQwT" role="1tU5fm" />
+              </node>
+              <node concept="Rh6nW" id="6yxoGioiQwU" role="1bW2Oz">
+                <property role="TrG5h" value="itC" />
+                <node concept="2jxLKc" id="6yxoGioiQwV" role="1tU5fm" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="6yxoGioiSj2" role="3cqZAp">
+          <node concept="2OqwBi" id="6yxoGioiSj3" role="3clFbG">
+            <node concept="37vLTw" id="6yxoGioiSj4" role="2Oq$k0">
+              <ref role="3cqZAo" node="6yxoGioiNsG" resolve="box" />
+            </node>
+            <node concept="liA8E" id="6yxoGioiSj5" role="2OqNvi">
+              <ref role="37wK5l" node="6yxoGioiyzB" resolve="processElement" />
+              <node concept="37vLTw" id="6yxoGioiS_W" role="37wK5m">
+                <ref role="3cqZAo" node="6yxoGioiQwI" resolve="ggw1" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="6yxoGioiRkg" role="3cqZAp" />
+        <node concept="3clFbF" id="3ZtutRa2FHn" role="3cqZAp">
+          <node concept="2OqwBi" id="3ZtutRa2FHo" role="3clFbG">
+            <node concept="37vLTw" id="3ZtutRa2FHp" role="2Oq$k0">
+              <ref role="3cqZAo" node="6yxoGioiNsG" resolve="box" />
+            </node>
+            <node concept="liA8E" id="3ZtutRa2FHq" role="2OqNvi">
+              <ref role="37wK5l" node="6yxoGioiyzB" resolve="processElement" />
+              <node concept="1bVj0M" id="3ZtutRa2FHr" role="37wK5m">
+                <node concept="37vLTG" id="3ZtutRa2Gks" role="1bW2Oz">
+                  <property role="TrG5h" value="bb" />
+                  <node concept="3uibUv" id="3ZtutRa2Gm2" role="1tU5fm">
+                    <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="3ZtutRa2GuP" role="1bW2Oz">
+                  <property role="TrG5h" value="cc" />
+                  <node concept="3uibUv" id="3ZtutRa2GyH" role="1tU5fm">
+                    <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="3ZtutRa2FHs" role="1bW5cS">
+                  <node concept="3clFbF" id="3ZtutRa2FHt" role="3cqZAp">
+                    <node concept="37vLTI" id="3ZtutRa2FHu" role="3clFbG">
+                      <node concept="37vLTw" id="3ZtutRa2GH7" role="37vLTx">
+                        <ref role="3cqZAo" node="3ZtutRa2GuP" resolve="cc" />
+                      </node>
+                      <node concept="37vLTw" id="3ZtutRa2GE3" role="37vLTJ">
+                        <ref role="3cqZAo" node="3ZtutRa2Gks" resolve="bb" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3SKdUt" id="3ZtutRa2OA5" role="3cqZAp">
+          <node concept="1PaTwC" id="3ZtutRa2OA6" role="1aUNEU">
+            <node concept="3oM_SD" id="3ZtutRa2OA7" role="1PaTwD">
+              <property role="3oM_SC" value="contravariant" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa2ORu" role="1PaTwD">
+              <property role="3oM_SC" value="args," />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa2ORx" role="1PaTwD">
+              <property role="3oM_SC" value="ok" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3ZtutRa2KMu" role="3cqZAp">
+          <node concept="2OqwBi" id="3ZtutRa2KMv" role="3clFbG">
+            <node concept="37vLTw" id="3ZtutRa2KMw" role="2Oq$k0">
+              <ref role="3cqZAo" node="6yxoGioiNsG" resolve="box" />
+            </node>
+            <node concept="liA8E" id="3ZtutRa2KMx" role="2OqNvi">
+              <ref role="37wK5l" node="6yxoGioiyzB" resolve="processElement" />
+              <node concept="1bVj0M" id="3ZtutRa2KMy" role="37wK5m">
+                <node concept="37vLTG" id="3ZtutRa2KMz" role="1bW2Oz">
+                  <property role="TrG5h" value="aa1" />
+                  <node concept="3uibUv" id="3ZtutRa2O5s" role="1tU5fm">
+                    <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureParamInference.A" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="3ZtutRa2KM_" role="1bW2Oz">
+                  <property role="TrG5h" value="aa2" />
+                  <node concept="3uibUv" id="3ZtutRa2LrO" role="1tU5fm">
+                    <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureParamInference.A" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="3ZtutRa2KMB" role="1bW5cS" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3ZtutRa2OT4" role="3cqZAp">
+          <node concept="2OqwBi" id="3ZtutRa2OT5" role="3clFbG">
+            <node concept="37vLTw" id="3ZtutRa2OT6" role="2Oq$k0">
+              <ref role="3cqZAo" node="6yxoGioiNsG" resolve="box" />
+            </node>
+            <node concept="liA8E" id="3ZtutRa2OT7" role="2OqNvi">
+              <ref role="37wK5l" node="6yxoGioiyzB" resolve="processElement" />
+              <node concept="1bVj0M" id="3ZtutRa2OT8" role="37wK5m">
+                <node concept="37vLTG" id="3ZtutRa2OT9" role="1bW2Oz">
+                  <property role="TrG5h" value="cc1" />
+                  <node concept="3uibUv" id="3ZtutRa2Pl9" role="1tU5fm">
+                    <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="3ZtutRa2OTb" role="1bW2Oz">
+                  <property role="TrG5h" value="cc2" />
+                  <node concept="3uibUv" id="3ZtutRa2PpD" role="1tU5fm">
+                    <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="3ZtutRa2OTd" role="1bW5cS" />
+                <node concept="1U20sH" id="3ZtutRa2QMv" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3ZtutRa2WgF" role="3cqZAp" />
+        <node concept="3SKdUt" id="3ZtutRa368f" role="3cqZAp">
+          <node concept="1PaTwC" id="3ZtutRa368g" role="1aUNEU">
+            <node concept="3oM_SD" id="3ZtutRa368h" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa36wo" role="1PaTwD">
+              <property role="3oM_SC" value="vars" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa36wG" role="1PaTwD">
+              <property role="3oM_SC" value="don't" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa36x0" role="1PaTwD">
+              <property role="3oM_SC" value="mix" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa36xd" role="1PaTwD">
+              <property role="3oM_SC" value="up" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa36xj" role="1PaTwD">
+              <property role="3oM_SC" value="with" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa36xy" role="1PaTwD">
+              <property role="3oM_SC" value="ground" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa36xM" role="1PaTwD">
+              <property role="3oM_SC" value="types" />
+            </node>
+            <node concept="3oM_SD" id="3ZtutRa36xV" role="1PaTwD">
+              <property role="3oM_SC" value="here" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3ZtutRa2Xt8" role="3cqZAp">
+          <node concept="2OqwBi" id="3ZtutRa2Xt9" role="3clFbG">
+            <node concept="37vLTw" id="3ZtutRa2Xta" role="2Oq$k0">
+              <ref role="3cqZAo" node="6yxoGioiNsG" resolve="box" />
+            </node>
+            <node concept="liA8E" id="3ZtutRa2Xtb" role="2OqNvi">
+              <ref role="37wK5l" node="6yxoGioiyzB" resolve="processElement" />
+              <node concept="1bVj0M" id="3ZtutRa2Xtc" role="37wK5m">
+                <node concept="37vLTG" id="3ZtutRa2Xtd" role="1bW2Oz">
+                  <property role="TrG5h" value="yy" />
+                  <node concept="16syzq" id="3ZtutRa2Yzv" role="1tU5fm">
+                    <ref role="16sUi3" node="3ZtutRa2Ukq" resolve="Y1" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="3ZtutRa2Xtf" role="1bW2Oz">
+                  <property role="TrG5h" value="zz" />
+                  <node concept="16syzq" id="3ZtutRa2ZKW" role="1tU5fm">
+                    <ref role="16sUi3" node="3ZtutRa2VcN" resolve="Z1" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="3ZtutRa2Xth" role="1bW5cS" />
+                <node concept="1U20sH" id="3ZtutRa35DM" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3ZtutRa2ZVO" role="3cqZAp">
+          <node concept="2OqwBi" id="3ZtutRa2ZVP" role="3clFbG">
+            <node concept="37vLTw" id="3ZtutRa2ZVQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="6yxoGioiNsG" resolve="box" />
+            </node>
+            <node concept="liA8E" id="3ZtutRa2ZVR" role="2OqNvi">
+              <ref role="37wK5l" node="6yxoGioiyzB" resolve="processElement" />
+              <node concept="1bVj0M" id="3ZtutRa2ZVS" role="37wK5m">
+                <node concept="37vLTG" id="3ZtutRa2ZVT" role="1bW2Oz">
+                  <property role="TrG5h" value="zz1" />
+                  <node concept="16syzq" id="3ZtutRa30_m" role="1tU5fm">
+                    <ref role="16sUi3" node="3ZtutRa2VcN" resolve="Z1" />
+                  </node>
+                </node>
+                <node concept="37vLTG" id="3ZtutRa2ZVV" role="1bW2Oz">
+                  <property role="TrG5h" value="zz2" />
+                  <node concept="16syzq" id="3ZtutRa2ZVW" role="1tU5fm">
+                    <ref role="16sUi3" node="3ZtutRa2VcN" resolve="Z1" />
+                  </node>
+                </node>
+                <node concept="3clFbS" id="3ZtutRa2ZVX" role="1bW5cS" />
+                <node concept="1U20sH" id="3ZtutRa30Fr" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3ZtutRa2Wiq" role="3cqZAp" />
+        <node concept="3clFbF" id="6yxoGioiQEz" role="3cqZAp">
+          <node concept="2OqwBi" id="6yxoGioiQJB" role="3clFbG">
+            <node concept="37vLTw" id="6yxoGioiQEx" role="2Oq$k0">
+              <ref role="3cqZAo" node="6yxoGioiNsG" resolve="box" />
+            </node>
+            <node concept="liA8E" id="6yxoGioiQSn" role="2OqNvi">
+              <ref role="37wK5l" node="6yxoGioiyzB" resolve="processElement" />
+              <node concept="1bVj0M" id="6yxoGioiQUE" role="37wK5m">
+                <node concept="3clFbS" id="6yxoGioiQUF" role="1bW5cS">
+                  <node concept="3clFbF" id="6yxoGioiQUG" role="3cqZAp">
+                    <node concept="37vLTI" id="6yxoGioiQUH" role="3clFbG">
+                      <node concept="37vLTw" id="6yxoGioiQUI" role="37vLTx">
+                        <ref role="3cqZAo" node="6yxoGioiQUM" resolve="itC" />
+                      </node>
+                      <node concept="37vLTw" id="6yxoGioiQUJ" role="37vLTJ">
+                        <ref role="3cqZAo" node="6yxoGioiQUK" resolve="itB" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="6yxoGioiQUK" role="1bW2Oz">
+                  <property role="TrG5h" value="itB" />
+                  <node concept="2jxLKc" id="6yxoGioiQUL" role="1tU5fm" />
+                </node>
+                <node concept="Rh6nW" id="6yxoGioiQUM" role="1bW2Oz">
+                  <property role="TrG5h" value="itC" />
+                  <node concept="2jxLKc" id="6yxoGioiQUN" role="1tU5fm" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3ZtutRa2Re4" role="3cqZAp">
+          <node concept="2OqwBi" id="3ZtutRa2Re5" role="3clFbG">
+            <node concept="37vLTw" id="3ZtutRa2Re6" role="2Oq$k0">
+              <ref role="3cqZAo" node="6yxoGioiNsG" resolve="box" />
+            </node>
+            <node concept="liA8E" id="3ZtutRa2Re7" role="2OqNvi">
+              <ref role="37wK5l" node="6yxoGioiyzB" resolve="processElement" />
+              <node concept="1bVj0M" id="3ZtutRa2Re8" role="37wK5m">
+                <node concept="3clFbS" id="3ZtutRa2Re9" role="1bW5cS">
+                  <node concept="3clFbF" id="3ZtutRa2Rea" role="3cqZAp">
+                    <node concept="37vLTI" id="3ZtutRa2Reb" role="3clFbG">
+                      <node concept="37vLTw" id="3ZtutRa2Rec" role="37vLTx">
+                        <ref role="3cqZAo" node="3ZtutRa2Reg" resolve="itC" />
+                      </node>
+                      <node concept="37vLTw" id="3ZtutRa2SEJ" role="37vLTJ">
+                        <ref role="3cqZAo" node="3ZtutRa2SqM" resolve="cc1" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTG" id="3ZtutRa2SqM" role="1bW2Oz">
+                  <property role="TrG5h" value="cc1" />
+                  <node concept="3uibUv" id="3ZtutRa2SqN" role="1tU5fm">
+                    <ref role="3uigEE" node="554EtBHyc2R" resolve="ClosureParamInference.C" />
+                  </node>
+                </node>
+                <node concept="Rh6nW" id="3ZtutRa2Reg" role="1bW2Oz">
+                  <property role="TrG5h" value="itC" />
+                  <node concept="2jxLKc" id="3ZtutRa2Reh" role="1tU5fm" />
+                </node>
+                <node concept="1U20sH" id="3ZtutRa2TUl" role="lGtFl">
+                  <property role="1U20sK" value="error" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="6yxoGioiAg_" role="1B3o_S" />
+      <node concept="3cqZAl" id="6yxoGioiBat" role="3clF45" />
+      <node concept="16euLQ" id="3ZtutRa2YM8" role="16eVyc">
+        <property role="TrG5h" value="X1" />
+        <node concept="3uibUv" id="3ZtutRa2ZC2" role="3ztrMU">
+          <ref role="3uigEE" node="554EtBHyc2M" resolve="ClosureParamInference.A" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="3ZtutRa2Ukq" role="16eVyc">
+        <property role="TrG5h" value="Y1" />
+        <node concept="3uibUv" id="3ZtutRa2VcR" role="3ztrMU">
+          <ref role="3uigEE" node="554EtBHyc2O" resolve="ClosureParamInference.B" />
+        </node>
+      </node>
+      <node concept="16euLQ" id="3ZtutRa2VcN" role="16eVyc">
+        <property role="TrG5h" value="Z1" />
+        <node concept="16syzq" id="3ZtutRa32QD" role="3ztrMU">
+          <ref role="16sUi3" node="3ZtutRa2Ukq" resolve="Y1" />
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="554EtBHyc7F" role="jymVt" />
     <node concept="3Tm1VV" id="554EtBHyc7G" role="1B3o_S" />
   </node>
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.yield@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps
similarity index 90%
rename from samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.yield@tests.mps
rename to samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps
index e963ecf5..36ecdd98 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.yield@tests.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.closuresExt.test/models/jetbrains.mps.baseLanguage.closuresExt.test.collections@tests.mps
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model ref="r:b7d48b6b-72b6-4070-81f0-91a348d69e72(jetbrains.mps.baseLanguage.closuresExt.test.yield@tests)">
+<model ref="r:b7d48b6b-72b6-4070-81f0-91a348d69e72(jetbrains.mps.baseLanguage.closuresExt.test.collections@tests)">
   <persistence version="9" />
   <languages>
     <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="5" />
@@ -133,7 +133,7 @@
     </language>
   </registry>
   <node concept="1lH9Xt" id="7u0sJ20Oy8r">
-    <property role="TrG5h" value="ClosuresYield" />
+    <property role="TrG5h" value="ClosuresWithCollections" />
     <node concept="1LZb2c" id="7u0sJ20Oy8s" role="1SL9yI">
       <property role="TrG5h" value="closuresAndSequence" />
       <node concept="3cqZAl" id="7u0sJ20Oy8y" role="3clF45" />
@@ -163,6 +163,35 @@
         </node>
       </node>
     </node>
+    <node concept="1LZb2c" id="5pvXCF9sDdD" role="1SL9yI">
+      <property role="TrG5h" value="closureParamInference" />
+      <node concept="3cqZAl" id="5pvXCF9sDdE" role="3clF45" />
+      <node concept="3clFbS" id="5pvXCF9sDdF" role="3clF47">
+        <node concept="2Hmddi" id="5pvXCF9sDdG" role="3cqZAp">
+          <node concept="2OqwBi" id="5pvXCF9sDdH" role="2Hmdds">
+            <node concept="2YIFZM" id="5pvXCF9sDdI" role="2Oq$k0">
+              <ref role="37wK5l" to="tj24:27bTNFfaOo$" resolve="ofNode" />
+              <ref role="1Pybhc" to="tj24:1N_0WA5JxZO" resolve="TypecheckingTestHelper" />
+              <node concept="2OqwBi" id="5pvXCF9sDdJ" role="37wK5m">
+                <node concept="2WthIp" id="5pvXCF9sDdK" role="2Oq$k0" />
+                <node concept="2XshWL" id="5pvXCF9sDdL" role="2OqNvi">
+                  <ref role="2WH_rO" node="7u0sJ20Oy8x" resolve="resolve" />
+                  <node concept="2tJFMh" id="5pvXCF9sDdM" role="2XxRq1">
+                    <node concept="ZC_QK" id="5pvXCF9sETl" role="2tJFKM">
+                      <ref role="2aWVGs" to="kui3:554EtBHyc2K" resolve="ClosureParamInference" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="1jxXqW" id="5pvXCF9sDdO" role="37wK5m" />
+            </node>
+            <node concept="liA8E" id="5pvXCF9sDdP" role="2OqNvi">
+              <ref role="37wK5l" to="tj24:27bTNFfaYS2" resolve="checkTypes" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2XrIbr" id="7u0sJ20Oy8x" role="1qtyYc">
       <property role="TrG5h" value="resolve" />
       <node concept="37vLTG" id="7u0sJ20Oy8G" role="3clF46">