From a2f8f5e6f364d3dbe67b6580bcda7630c7b15919 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Tue, 24 Dec 2019 18:47:50 +0300
Subject: [PATCH] Handle cases with free & inference variables in containment,
 remove few unneeded rules (MPSCR-11)

Remove rules which handle capture+inference var case separately: it's already handled.
Remove rule with error on bound which shouldn't be triggered with new hasBound semantics.
Add symmetric rule for case value+inference var: types can be inferred nevermind relation direction.
Add rules for free vars without bounds (these ain't inference vars). Need in such vars arise when
e.g. params in classifierType terms must be somehow accessed. It's used in MethodCall rules.
---
 .../jetbrains.mps.baseLanguageExt.types.mps   | 1288 ++++++-----------
 ...mps.baseLanguageExt.test.code.generics.mps |  147 +-
 2 files changed, 566 insertions(+), 869 deletions(-)

diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
index 6da0b5a4..9f5d45fe 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/jetbrains.mps.baseLanguageExt.types.mps
@@ -11400,24 +11400,8 @@
       </node>
     </node>
     <node concept="1nLNMY" id="3R6X$QVWF82" role="1nK1Vg">
-      <property role="TrG5h" value="ground_containedIn_var_ubound" />
+      <property role="TrG5h" value="value_containedIn_var_ubound" />
       <node concept="3clFbS" id="3R6X$QVWF83" role="1nLNMH">
-        <node concept="3SKdUt" id="2Cji6ER1btk" role="3cqZAp">
-          <node concept="1PaTwC" id="2Cji6ER1btl" role="3ndbpf">
-            <node concept="3oM_SD" id="2Cji6ER1btn" role="1PaTwD">
-              <property role="3oM_SC" value="todo:" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER1byF" role="1PaTwD">
-              <property role="3oM_SC" value="need" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER1bAx" role="1PaTwD">
-              <property role="3oM_SC" value="symmetric" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER1bEo" role="1PaTwD">
-              <property role="3oM_SC" value="case?" />
-            </node>
-          </node>
-        </node>
         <node concept="3SKdUt" id="2Cji6ER15wp" role="3cqZAp">
           <node concept="1PaTwC" id="2Cji6ER15wq" role="3ndbpf">
             <node concept="3oM_SD" id="2Cji6ER15ws" role="1PaTwD">
@@ -11446,6 +11430,7 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="2Cji6ERa01O" role="3cqZAp" />
         <node concept="1nLNNL" id="3R6X$QVWGsp" role="3cqZAp">
           <node concept="1nLNMm" id="3R6X$QVWGsq" role="1nLNNK">
             <node concept="0eUR_" id="3R6X$QVWGsr" role="0UC6o">
@@ -11542,106 +11527,96 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4ea1t_2Q5yK" role="3cqZAp" />
-        <node concept="3SKdUt" id="3R6X$QW90x7" role="3cqZAp">
-          <node concept="1PaTwC" id="3R6X$QW90x8" role="3ndbpf">
-            <node concept="3oM_SD" id="3R6X$QW90xa" role="1PaTwD">
-              <property role="3oM_SC" value="fixme:" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW90_E" role="1PaTwD">
-              <property role="3oM_SC" value="actually" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW90Dw" role="1PaTwD">
-              <property role="3oM_SC" value="just" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW90T8" role="1PaTwD">
-              <property role="3oM_SC" value="S=T" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW90X0" role="1PaTwD">
-              <property role="3oM_SC" value="must" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW90X6" role="1PaTwD">
-              <property role="3oM_SC" value="reactivate" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW9110" role="1PaTwD">
-              <property role="3oM_SC" value="hasBound" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW918I" role="1PaTwD">
-              <property role="3oM_SC" value="and" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW918R" role="1PaTwD">
-              <property role="3oM_SC" value="it" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW91cO" role="1PaTwD">
-              <property role="3oM_SC" value="would" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW91gM" role="1PaTwD">
-              <property role="3oM_SC" value="check" />
-            </node>
-            <node concept="3oM_SD" id="3R6X$QW91gY" role="1PaTwD">
-              <property role="3oM_SC" value="convertsTo" />
-            </node>
-          </node>
-        </node>
-        <node concept="1X3_iC" id="4ea1t_2Q5t8" role="lGtFl">
-          <property role="3V$3am" value="statement" />
-          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-          <node concept="1nLNNL" id="3x17eoJwXKR" role="8Wnug">
-            <node concept="1nLNMm" id="3x17eoJwXKS" role="1nLNNK">
-              <node concept="0eUR_" id="3x17eoJwXKT" role="0UC6o">
-                <node concept="3NuqgR" id="3x17eoJwXKU" role="0eVf_">
-                  <node concept="aZer4" id="3x17eoJwXKV" role="3XD1gS">
-                    <property role="TrG5h" value="S" />
-                  </node>
-                  <node concept="aZer4" id="3x17eoJwXKW" role="3XD1gS">
-                    <property role="TrG5h" value="T" />
-                  </node>
+        <node concept="3clFbH" id="2Cji6ERa0Gq" role="3cqZAp" />
+        <node concept="1nLNNL" id="2Cji6ERa0If" role="3cqZAp">
+          <node concept="1nLNMm" id="2Cji6ERa0Ig" role="1nLNNK">
+            <node concept="0eUR_" id="2Cji6ERa0Ih" role="0UC6o">
+              <node concept="3NuqgR" id="2Cji6ERa0Ii" role="0eVf_">
+                <node concept="aZer4" id="2Cji6ERa0Ij" role="3XD1gS">
+                  <property role="TrG5h" value="S" />
+                </node>
+                <node concept="aZer4" id="2Cji6ERa0Ik" role="3XD1gS">
+                  <property role="TrG5h" value="T" />
                 </node>
               </node>
-              <node concept="3Aq93q" id="3x17eoJwXL0" role="1nLNMb">
-                <property role="3ArMco" value="false" />
-                <node concept="3I6sU6" id="3x17eoJwXL1" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="3x17eoJwXL2" role="3I6sU7">
-                    <node concept="3Aqt3T" id="3x17eoJwXL3" role="3I6s78">
-                      <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
-                      <node concept="a7P8L" id="3x17eoJwXL4" role="3AunhB">
-                        <ref role="a7OzE" node="3x17eoJwXKV" resolve="S" />
-                      </node>
-                      <node concept="a7P8L" id="3x17eoJwXL5" role="3AunhB">
-                        <ref role="a7OzE" node="3x17eoJwXKW" resolve="T" />
-                      </node>
+              <node concept="3NuqgR" id="2Cji6ERa0Il" role="0eVf_">
+                <node concept="aZer4" id="2Cji6ERa0Im" role="3XD1gS">
+                  <property role="TrG5h" value="Sbnd" />
+                </node>
+                <node concept="aZer4" id="2Cji6ERa0In" role="3XD1gS">
+                  <property role="TrG5h" value="Tbnd" />
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="2Cji6ERa0Io" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="2Cji6ERa0Ip" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Cji6ERa0Iq" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Cji6ERa0Ir" role="3I6s78">
+                    <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
+                    <node concept="a7P8L" id="2Cji6ERa0Is" role="3AunhB">
+                      <ref role="a7OzE" node="2Cji6ERa0Ij" resolve="S" />
+                    </node>
+                    <node concept="a7P8L" id="2Cji6ERa0It" role="3AunhB">
+                      <ref role="a7OzE" node="2Cji6ERa0Ik" resolve="T" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3Aq9E8" id="3x17eoJwXLc" role="1nLNMd">
-                <node concept="3I6sU6" id="3x17eoJwXLd" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="3x17eoJwXLi" role="3I6sU7">
-                    <node concept="3A8Hvi" id="3x17eoJwXLj" role="3I6s78">
-                      <node concept="a7P8L" id="3x17eoJwXLk" role="3A8wtg">
-                        <ref role="a7OzE" node="3x17eoJwXKV" resolve="S" />
-                      </node>
-                      <node concept="a7P8L" id="3x17eoJwXLl" role="3A8w4Q">
-                        <ref role="a7OzE" node="3x17eoJwXKW" resolve="T" />
-                      </node>
+            </node>
+            <node concept="3Aq93q" id="2Cji6ERa0Iu" role="1nLNMb">
+              <node concept="3I6sU6" id="2Cji6ERa0Iv" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Cji6ERa0Iw" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Cji6ERa0Ix" role="3I6s78">
+                    <ref role="3AqCNq" node="5310cdpUCuT" resolve="hasBound" />
+                    <node concept="a7P8L" id="2Cji6ERa15m" role="3AunhB">
+                      <ref role="a7OzE" node="2Cji6ERa0Ij" resolve="S" />
+                    </node>
+                    <node concept="a7P8L" id="2Cji6ERa19o" role="3AunhB">
+                      <ref role="a7OzE" node="2Cji6ERa0Im" resolve="Sbnd" />
                     </node>
                   </node>
                 </node>
               </node>
-              <node concept="3Aq9_M" id="3x17eoJwXLm" role="1nLNMa">
-                <node concept="3I6sU6" id="3x17eoJwXLn" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="3x17eoJwXLo" role="3I6sU7">
-                    <node concept="2aM9Np" id="3x17eoJwXLp" role="3I6s78">
-                      <node concept="a7P8L" id="3x17eoJwXLq" role="2aLmnP">
-                        <ref role="a7OzE" node="3x17eoJwXKV" resolve="S" />
-                      </node>
+            </node>
+            <node concept="3Aq9E8" id="2Cji6ERa0I$" role="1nLNMd">
+              <node concept="3I6sU6" id="2Cji6ERa0I_" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Cji6ERa0IA" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Cji6ERa0IB" role="3I6s78">
+                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                    <node concept="a7P8L" id="2Cji6ERa27i" role="3AunhB">
+                      <ref role="a7OzE" node="2Cji6ERa0Ik" resolve="T" />
+                    </node>
+                    <node concept="a7P8L" id="2Cji6ERa27z" role="3AunhB">
+                      <ref role="a7OzE" node="2Cji6ERa0Im" resolve="Sbnd" />
                     </node>
                   </node>
-                  <node concept="3I6s7M" id="3x17eoJwXLr" role="3I6sU7">
-                    <node concept="2aLmEc" id="3x17eoJwXLs" role="3I6s78">
-                      <node concept="a7P8L" id="3x17eoJwXLt" role="2aLmnP">
-                        <ref role="a7OzE" node="3x17eoJwXKW" resolve="T" />
-                      </node>
+                </node>
+                <node concept="3I6s7M" id="2Cji6ERa0IE" role="3I6sU7">
+                  <node concept="3A8Hvi" id="2Cji6ERa0IF" role="3I6s78">
+                    <node concept="a7P8L" id="2Cji6ERa0IG" role="3A8wtg">
+                      <ref role="a7OzE" node="2Cji6ERa0Ij" resolve="S" />
+                    </node>
+                    <node concept="a7P8L" id="2Cji6ERa0IH" role="3A8w4Q">
+                      <ref role="a7OzE" node="2Cji6ERa0Ik" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9_M" id="2Cji6ERa0II" role="1nLNMa">
+              <node concept="3I6sU6" id="2Cji6ERa0IJ" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Cji6ERa1RW" role="3I6sU7">
+                  <node concept="2aM9Np" id="2Cji6ERa1RU" role="3I6s78">
+                    <node concept="a7P8L" id="2Cji6ERa1VP" role="2aLmnP">
+                      <ref role="a7OzE" node="2Cji6ERa0Ik" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="2Cji6ERa0IK" role="3I6sU7">
+                  <node concept="2aLmEc" id="2Cji6ERa1sJ" role="3I6s78">
+                    <node concept="a7P8L" id="2Cji6ERa1w_" role="2aLmnP">
+                      <ref role="a7OzE" node="2Cji6ERa0Ij" resolve="S" />
                     </node>
                   </node>
                 </node>
@@ -11768,159 +11743,125 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="6EY0p2vHApT" role="1nK1Vg">
-      <property role="TrG5h" value="var_noUbound_notContainedIn_var_ubound" />
-      <node concept="3clFbS" id="6EY0p2vHApU" role="1nLNMH">
-        <node concept="3SKdUt" id="2Cji6ER18bM" role="3cqZAp">
-          <node concept="1PaTwC" id="2Cji6ER18bN" role="3ndbpf">
-            <node concept="3oM_SD" id="2Cji6ER18bP" role="1PaTwD">
-              <property role="3oM_SC" value="fixme:" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18gs" role="1PaTwD">
-              <property role="3oM_SC" value="shouldn't" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18ki" role="1PaTwD">
-              <property role="3oM_SC" value="arise," />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18rW" role="1PaTwD">
-              <property role="3oM_SC" value="free" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18s1" role="1PaTwD">
-              <property role="3oM_SC" value="vars" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18vU" role="1PaTwD">
-              <property role="3oM_SC" value="must" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18w1" role="1PaTwD">
-              <property role="3oM_SC" value="always" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18zW" role="1PaTwD">
-              <property role="3oM_SC" value="have" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18BS" role="1PaTwD">
-              <property role="3oM_SC" value="a" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18NM" role="1PaTwD">
-              <property role="3oM_SC" value="bound," />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18RK" role="1PaTwD">
-              <property role="3oM_SC" value="even" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18RW" role="1PaTwD">
-              <property role="3oM_SC" value="if" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER197z" role="1PaTwD">
-              <property role="3oM_SC" value="it's" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER18S9" role="1PaTwD">
-              <property role="3oM_SC" value="Object" />
+    <node concept="1X3_iC" id="2Cji6ERbRGU" role="lGtFl">
+      <property role="3V$3am" value="template" />
+      <property role="3V$3ak" value="c4803b19-6d89-4a3b-bf82-390769514add/8335224865066015764/3575255234175157601" />
+      <node concept="1nLNMY" id="12QmIo_7slL" role="8Wnug">
+        <property role="TrG5h" value="var_containedIn_var_noUbound" />
+        <node concept="3clFbS" id="12QmIo_7slM" role="1nLNMH">
+          <node concept="3SKdUt" id="2Cji6ERfScB" role="3cqZAp">
+            <node concept="1PaTwC" id="2Cji6ERfScC" role="3ndbpf">
+              <node concept="3oM_SD" id="2Cji6ERfScE" role="1PaTwD">
+                <property role="3oM_SC" value="fixme:" />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfSdf" role="1PaTwD">
+                <property role="3oM_SC" value="when" />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfSh5" role="1PaTwD">
+                <property role="3oM_SC" value="can" />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfSkW" role="1PaTwD">
+                <property role="3oM_SC" value="this" />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfSl1" role="1PaTwD">
+                <property role="3oM_SC" value="case" />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfT8j" role="1PaTwD">
+                <property role="3oM_SC" value="arise?" />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfSl7" role="1PaTwD">
+                <property role="3oM_SC" value="in" />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfSp1" role="1PaTwD">
+                <property role="3oM_SC" value="principle," />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfSp9" role="1PaTwD">
+                <property role="3oM_SC" value="it" />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfSt5" role="1PaTwD">
+                <property role="3oM_SC" value="can," />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfSx2" role="1PaTwD">
+                <property role="3oM_SC" value="uncomment" />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfS_0" role="1PaTwD">
+                <property role="3oM_SC" value="if" />
+              </node>
+              <node concept="3oM_SD" id="2Cji6ERfSCZ" role="1PaTwD">
+                <property role="3oM_SC" value="needed." />
+              </node>
             </node>
           </node>
-        </node>
-        <node concept="1nLNNL" id="6EY0p2vHAq4" role="3cqZAp">
-          <node concept="1nLNMm" id="6EY0p2vHAq5" role="1nLNNK">
-            <node concept="0eUR_" id="6EY0p2vHAq6" role="0UC6o">
-              <node concept="3NuqgR" id="6EY0p2vHAq7" role="0eVf_">
-                <node concept="aZer4" id="6EY0p2vHAq8" role="3XD1gS">
-                  <property role="TrG5h" value="Object" />
+          <node concept="3clFbH" id="2Cji6ERfSZY" role="3cqZAp" />
+          <node concept="1nLNNL" id="12QmIo_7slN" role="3cqZAp">
+            <node concept="1nLNMm" id="12QmIo_7slO" role="1nLNNK">
+              <node concept="0eUR_" id="7lt0LtPBjTJ" role="0UC6o">
+                <node concept="3NuqgR" id="Co5va1J6hJ" role="0eVf_">
+                  <node concept="aZer4" id="Co5va1J6hK" role="3XD1gS">
+                    <property role="TrG5h" value="Object" />
+                  </node>
                 </node>
-              </node>
-              <node concept="3NuqgR" id="6EY0p2vHAq9" role="0eVf_">
-                <node concept="aZer4" id="6EY0p2vHAqa" role="3XD1gS">
-                  <property role="TrG5h" value="S" />
+                <node concept="3NuqgR" id="Co5va1J62p" role="0eVf_">
+                  <node concept="aZer4" id="Co5va1J62q" role="3XD1gS">
+                    <property role="TrG5h" value="S" />
+                  </node>
+                  <node concept="aZer4" id="Co5va1J62r" role="3XD1gS">
+                    <property role="TrG5h" value="T" />
+                  </node>
                 </node>
-                <node concept="aZer4" id="6EY0p2vHAqb" role="3XD1gS">
-                  <property role="TrG5h" value="T" />
-                </node>
-              </node>
-              <node concept="3NuqgR" id="6EY0p2vHAqc" role="0eVf_">
-                <node concept="aZer4" id="6EY0p2vHAqd" role="3XD1gS">
-                  <property role="TrG5h" value="Sbnd" />
-                </node>
-                <node concept="aZer4" id="6EY0p2vHAqe" role="3XD1gS">
-                  <property role="TrG5h" value="Tbnd" />
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq93q" id="6EY0p2vHAqf" role="1nLNMb">
-              <property role="3ArMco" value="false" />
-              <node concept="3I6sU6" id="6EY0p2vHAqg" role="3Ip0Jz">
-                <node concept="3I6s7M" id="6EY0p2vHAqh" role="3I6sU7">
-                  <node concept="3Aqt3T" id="6EY0p2vHAqi" role="3I6s78">
-                    <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
-                    <node concept="a7P8L" id="6EY0p2vHAqj" role="3AunhB">
-                      <ref role="a7OzE" node="6EY0p2vHAqa" resolve="S" />
-                    </node>
-                    <node concept="a7P8L" id="6EY0p2vHAqk" role="3AunhB">
-                      <ref role="a7OzE" node="6EY0p2vHAqb" resolve="T" />
-                    </node>
+                <node concept="3NuqgR" id="Co5va1J62y" role="0eVf_">
+                  <node concept="aZer4" id="Co5va1J62z" role="3XD1gS">
+                    <property role="TrG5h" value="Sbnd" />
+                  </node>
+                  <node concept="aZer4" id="Co5va1J62$" role="3XD1gS">
+                    <property role="TrG5h" value="Tbnd" />
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3Aq93q" id="6EY0p2vHA_d" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="6EY0p2vHA_e" role="3Ip0Jz">
-                <node concept="3I6s7M" id="6EY0p2vHA_o" role="3I6sU7">
-                  <node concept="3Aqt3T" id="6EY0p2vHA_n" role="3I6s78">
-                    <ref role="3AqCNq" node="5310cdpUCuT" resolve="hasBound" />
-                    <node concept="a7P8L" id="6EY0p2vHA_t" role="3AunhB">
-                      <ref role="a7OzE" node="6EY0p2vHAqb" resolve="T" />
-                    </node>
-                    <node concept="a7P8L" id="6EY0p2vHA_B" role="3AunhB">
-                      <ref role="a7OzE" node="6EY0p2vHAqe" resolve="Tbnd" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9E8" id="6EY0p2vHAAZ" role="1nLNMd">
-              <node concept="3I6sU6" id="6EY0p2vHAB0" role="3Ip0Jz">
-                <node concept="3I6s7M" id="4WwvXRZ8cw7" role="3I6sU7">
-                  <node concept="1lpGmL" id="4WwvXRZ8cw3" role="3I6s78">
-                    <node concept="3cpWs3" id="4WwvXRZ8e5j" role="1lp$hM">
-                      <node concept="3cpWs3" id="4WwvXRZ8d7s" role="3uHU7B">
-                        <node concept="3cpWs3" id="4WwvXRZ8d2S" role="3uHU7B">
-                          <node concept="Xl_RD" id="4WwvXRZ8cwe" role="3uHU7B">
-                            <property role="Xl_RC" value="free type variable " />
-                          </node>
-                          <node concept="1TmgYN" id="4WwvXRZbpRL" role="3uHU7w">
-                            <node concept="1nq8_$" id="4WwvXRZbpSs" role="1Tms7$">
-                              <node concept="a7P8L" id="4WwvXRZbpSq" role="1nq8_t">
-                                <ref role="a7OzE" node="6EY0p2vHAqa" resolve="S" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="Xl_RD" id="4WwvXRZ8d34" role="3uHU7w">
-                          <property role="Xl_RC" value=" is not contained in " />
-                        </node>
+              <node concept="3Aq93q" id="Co5va1J62o" role="1nLNMb">
+                <property role="3ArMco" value="false" />
+                <node concept="3I6sU6" id="Co5va1J62s" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="Co5va1J62t" role="3I6sU7">
+                    <node concept="3Aqt3T" id="Co5va1J62u" role="3I6s78">
+                      <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
+                      <node concept="a7P8L" id="Co5va1J62v" role="3AunhB">
+                        <ref role="a7OzE" node="Co5va1J62q" resolve="S" />
                       </node>
-                      <node concept="1TmgYN" id="4WwvXRZbq7g" role="3uHU7w">
-                        <node concept="1nq8_$" id="4WwvXRZbqch" role="1Tms7$">
-                          <node concept="a7P8L" id="4WwvXRZbqcf" role="1nq8_t">
-                            <ref role="a7OzE" node="6EY0p2vHAqb" resolve="T" />
-                          </node>
-                        </node>
+                      <node concept="a7P8L" id="Co5va1J62w" role="3AunhB">
+                        <ref role="a7OzE" node="Co5va1J62r" resolve="T" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-            <node concept="3Aq9_M" id="6EY0p2vJrUc" role="1nLNMa">
-              <node concept="3I6sU6" id="6EY0p2vJrUd" role="3Ip0Jz">
-                <node concept="3I6s7M" id="6EY0p2vJrUh" role="3I6sU7">
-                  <node concept="2aLmEc" id="6EY0p2vJrUg" role="3I6s78">
-                    <node concept="a7P8L" id="6EY0p2vJrUk" role="2aLmnP">
-                      <ref role="a7OzE" node="6EY0p2vHAqa" resolve="S" />
+              <node concept="3Aq9E8" id="Co5va1J62e" role="1nLNMd">
+                <node concept="3I6sU6" id="Co5va1J62f" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="Co5va1J62g" role="3I6sU7">
+                    <node concept="3A8Hvi" id="Co5va1J62h" role="3I6s78">
+                      <node concept="a7P8L" id="Co5va1J62i" role="3A8wtg">
+                        <ref role="a7OzE" node="Co5va1J62q" resolve="S" />
+                      </node>
+                      <node concept="a7P8L" id="Co5va1J62j" role="3A8w4Q">
+                        <ref role="a7OzE" node="Co5va1J62r" resolve="T" />
+                      </node>
                     </node>
                   </node>
                 </node>
-                <node concept="3I6s7M" id="6EY0p2vJrUt" role="3I6sU7">
-                  <node concept="2aLmEc" id="6EY0p2vJrUr" role="3I6s78">
-                    <node concept="a7P8L" id="6EY0p2vJrUz" role="2aLmnP">
-                      <ref role="a7OzE" node="6EY0p2vHAqb" resolve="T" />
+              </node>
+              <node concept="3Aq9_M" id="6EY0p2vLl5t" role="1nLNMa">
+                <node concept="3I6sU6" id="6EY0p2vLl5u" role="3Ip0Jz">
+                  <node concept="3I6s7M" id="6EY0p2vLl5y" role="3I6sU7">
+                    <node concept="2aLmEc" id="6EY0p2vLl5x" role="3I6s78">
+                      <node concept="a7P8L" id="6EY0p2vLl5_" role="2aLmnP">
+                        <ref role="a7OzE" node="Co5va1J62q" resolve="S" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3I6s7M" id="6EY0p2vLl5I" role="3I6sU7">
+                    <node concept="2aLmEc" id="6EY0p2vLl5G" role="3I6s78">
+                      <node concept="a7P8L" id="6EY0p2vLl5O" role="2aLmnP">
+                        <ref role="a7OzE" node="Co5va1J62r" resolve="T" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -11930,77 +11871,127 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="12QmIo_7slL" role="1nK1Vg">
-      <property role="TrG5h" value="var_containedIn_var_noUbound" />
-      <node concept="3clFbS" id="12QmIo_7slM" role="1nLNMH">
-        <node concept="1nLNNL" id="12QmIo_7slN" role="3cqZAp">
-          <node concept="1nLNMm" id="12QmIo_7slO" role="1nLNNK">
-            <node concept="0eUR_" id="7lt0LtPBjTJ" role="0UC6o">
-              <node concept="3NuqgR" id="Co5va1J6hJ" role="0eVf_">
-                <node concept="aZer4" id="Co5va1J6hK" role="3XD1gS">
-                  <property role="TrG5h" value="Object" />
-                </node>
-              </node>
-              <node concept="3NuqgR" id="Co5va1J62p" role="0eVf_">
-                <node concept="aZer4" id="Co5va1J62q" role="3XD1gS">
+    <node concept="1nLNMY" id="2Cji6ERbRtK" role="1nK1Vg">
+      <property role="TrG5h" value="value_containedIn_var_noUbound" />
+      <node concept="3clFbS" id="2Cji6ERbRtL" role="1nLNMH">
+        <node concept="1nLNNL" id="2Cji6ERbRtW" role="3cqZAp">
+          <node concept="1nLNMm" id="2Cji6ERbRtX" role="1nLNNK">
+            <node concept="0eUR_" id="2Cji6ERbRtY" role="0UC6o">
+              <node concept="3NuqgR" id="2Cji6ERbRu1" role="0eVf_">
+                <node concept="aZer4" id="2Cji6ERbRu2" role="3XD1gS">
                   <property role="TrG5h" value="S" />
                 </node>
-                <node concept="aZer4" id="Co5va1J62r" role="3XD1gS">
+                <node concept="aZer4" id="2Cji6ERbRu3" role="3XD1gS">
                   <property role="TrG5h" value="T" />
                 </node>
               </node>
-              <node concept="3NuqgR" id="Co5va1J62y" role="0eVf_">
-                <node concept="aZer4" id="Co5va1J62z" role="3XD1gS">
-                  <property role="TrG5h" value="Sbnd" />
-                </node>
-                <node concept="aZer4" id="Co5va1J62$" role="3XD1gS">
-                  <property role="TrG5h" value="Tbnd" />
-                </node>
-              </node>
             </node>
-            <node concept="3Aq93q" id="Co5va1J62o" role="1nLNMb">
+            <node concept="3Aq93q" id="2Cji6ERbRu4" role="1nLNMb">
               <property role="3ArMco" value="false" />
-              <node concept="3I6sU6" id="Co5va1J62s" role="3Ip0Jz">
-                <node concept="3I6s7M" id="Co5va1J62t" role="3I6sU7">
-                  <node concept="3Aqt3T" id="Co5va1J62u" role="3I6s78">
+              <node concept="3I6sU6" id="2Cji6ERbRu5" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Cji6ERbRu6" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Cji6ERbRu7" role="3I6s78">
                     <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
-                    <node concept="a7P8L" id="Co5va1J62v" role="3AunhB">
-                      <ref role="a7OzE" node="Co5va1J62q" resolve="S" />
+                    <node concept="a7P8L" id="2Cji6ERbRu8" role="3AunhB">
+                      <ref role="a7OzE" node="2Cji6ERbRu2" resolve="S" />
                     </node>
-                    <node concept="a7P8L" id="Co5va1J62w" role="3AunhB">
-                      <ref role="a7OzE" node="Co5va1J62r" resolve="T" />
+                    <node concept="a7P8L" id="2Cji6ERbRu9" role="3AunhB">
+                      <ref role="a7OzE" node="2Cji6ERbRu3" resolve="T" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3Aq9E8" id="Co5va1J62e" role="1nLNMd">
-              <node concept="3I6sU6" id="Co5va1J62f" role="3Ip0Jz">
-                <node concept="3I6s7M" id="Co5va1J62g" role="3I6sU7">
-                  <node concept="3A8Hvi" id="Co5va1J62h" role="3I6s78">
-                    <node concept="a7P8L" id="Co5va1J62i" role="3A8wtg">
-                      <ref role="a7OzE" node="Co5va1J62q" resolve="S" />
+            <node concept="3Aq9_M" id="2Cji6ERbRua" role="1nLNMa">
+              <node concept="3I6sU6" id="2Cji6ERbRub" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Cji6ERbRuc" role="3I6sU7">
+                  <node concept="2aM9Np" id="2Cji6ERbRud" role="3I6s78">
+                    <node concept="a7P8L" id="2Cji6ERbRue" role="2aLmnP">
+                      <ref role="a7OzE" node="2Cji6ERbRu2" resolve="S" />
                     </node>
-                    <node concept="a7P8L" id="Co5va1J62j" role="3A8w4Q">
-                      <ref role="a7OzE" node="Co5va1J62r" resolve="T" />
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="2Cji6ERbRuf" role="3I6sU7">
+                  <node concept="2aLmEc" id="2Cji6ERbRug" role="3I6s78">
+                    <node concept="a7P8L" id="2Cji6ERbRuh" role="2aLmnP">
+                      <ref role="a7OzE" node="2Cji6ERbRu3" resolve="T" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3Aq9_M" id="6EY0p2vLl5t" role="1nLNMa">
-              <node concept="3I6sU6" id="6EY0p2vLl5u" role="3Ip0Jz">
-                <node concept="3I6s7M" id="6EY0p2vLl5y" role="3I6sU7">
-                  <node concept="2aLmEc" id="6EY0p2vLl5x" role="3I6s78">
-                    <node concept="a7P8L" id="6EY0p2vLl5_" role="2aLmnP">
-                      <ref role="a7OzE" node="Co5va1J62q" resolve="S" />
+            <node concept="3Aq9E8" id="2Cji6ERbRui" role="1nLNMd">
+              <node concept="3I6sU6" id="2Cji6ERbRuj" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Cji6ERbRuk" role="3I6sU7">
+                  <node concept="3A8Hvi" id="2Cji6ERbRul" role="3I6s78">
+                    <node concept="a7P8L" id="2Cji6ERbRum" role="3A8wtg">
+                      <ref role="a7OzE" node="2Cji6ERbRu2" resolve="S" />
+                    </node>
+                    <node concept="a7P8L" id="2Cji6ERbRun" role="3A8w4Q">
+                      <ref role="a7OzE" node="2Cji6ERbRu3" resolve="T" />
                     </node>
                   </node>
                 </node>
-                <node concept="3I6s7M" id="6EY0p2vLl5I" role="3I6sU7">
-                  <node concept="2aLmEc" id="6EY0p2vLl5G" role="3I6s78">
-                    <node concept="a7P8L" id="6EY0p2vLl5O" role="2aLmnP">
-                      <ref role="a7OzE" node="Co5va1J62r" resolve="T" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2Cji6ERe4R7" role="3cqZAp" />
+        <node concept="1nLNNL" id="2Cji6ERe4HB" role="3cqZAp">
+          <node concept="1nLNMm" id="2Cji6ERe4HC" role="1nLNNK">
+            <node concept="0eUR_" id="2Cji6ERe4HD" role="0UC6o">
+              <node concept="3NuqgR" id="2Cji6ERe4HG" role="0eVf_">
+                <node concept="aZer4" id="2Cji6ERe4HH" role="3XD1gS">
+                  <property role="TrG5h" value="S" />
+                </node>
+                <node concept="aZer4" id="2Cji6ERe4HI" role="3XD1gS">
+                  <property role="TrG5h" value="T" />
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="2Cji6ERe4HJ" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="2Cji6ERe4HK" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Cji6ERe4HL" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Cji6ERe4HM" role="3I6s78">
+                    <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
+                    <node concept="a7P8L" id="2Cji6ERe4HN" role="3AunhB">
+                      <ref role="a7OzE" node="2Cji6ERe4HH" resolve="S" />
+                    </node>
+                    <node concept="a7P8L" id="2Cji6ERe4HO" role="3AunhB">
+                      <ref role="a7OzE" node="2Cji6ERe4HI" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9_M" id="2Cji6ERe4HP" role="1nLNMa">
+              <node concept="3I6sU6" id="2Cji6ERe4HQ" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Cji6ERe4HR" role="3I6sU7">
+                  <node concept="2aM9Np" id="2Cji6ERe4HS" role="3I6s78">
+                    <node concept="a7P8L" id="2Cji6ERe5iS" role="2aLmnP">
+                      <ref role="a7OzE" node="2Cji6ERe4HI" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="2Cji6ERe4HU" role="3I6sU7">
+                  <node concept="2aLmEc" id="2Cji6ERe4HV" role="3I6s78">
+                    <node concept="a7P8L" id="2Cji6ERe5mR" role="2aLmnP">
+                      <ref role="a7OzE" node="2Cji6ERe4HH" resolve="S" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9E8" id="2Cji6ERe4HX" role="1nLNMd">
+              <node concept="3I6sU6" id="2Cji6ERe4HY" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Cji6ERe4HZ" role="3I6sU7">
+                  <node concept="3A8Hvi" id="2Cji6ERe4I0" role="3I6s78">
+                    <node concept="a7P8L" id="2Cji6ERe4I1" role="3A8wtg">
+                      <ref role="a7OzE" node="2Cji6ERe4HH" resolve="S" />
+                    </node>
+                    <node concept="a7P8L" id="2Cji6ERe4I2" role="3A8w4Q">
+                      <ref role="a7OzE" node="2Cji6ERe4HI" resolve="T" />
                     </node>
                   </node>
                 </node>
@@ -12090,6 +12081,152 @@
         </node>
       </node>
     </node>
+    <node concept="1nLNMY" id="2QSgdliKLc$" role="1nK1Vg">
+      <property role="TrG5h" value="value_containedIn_capture" />
+      <node concept="3clFbS" id="2QSgdliKLc_" role="1nLNMH">
+        <node concept="3SKdUt" id="2Cji6ER9zbz" role="3cqZAp">
+          <node concept="1PaTwC" id="2Cji6ER9zb$" role="3ndbpf">
+            <node concept="3oM_SD" id="2Cji6ER9zbA" role="1PaTwD">
+              <property role="3oM_SC" value="covers" />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9zjS" role="1PaTwD">
+              <property role="3oM_SC" value="cases" />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9zjV" role="1PaTwD">
+              <property role="3oM_SC" value="when" />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9znM" role="1PaTwD">
+              <property role="3oM_SC" value="T" />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9znR" role="1PaTwD">
+              <property role="3oM_SC" value="is" />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9zrK" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9zrR" role="1PaTwD">
+              <property role="3oM_SC" value="var," />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9zJA" role="1PaTwD">
+              <property role="3oM_SC" value="wildcard," />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9zNy" role="1PaTwD">
+              <property role="3oM_SC" value="capture" />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9zRv" role="1PaTwD">
+              <property role="3oM_SC" value="or" />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9zZD" role="1PaTwD">
+              <property role="3oM_SC" value="other" />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9$3C" role="1PaTwD">
+              <property role="3oM_SC" value="ground" />
+            </node>
+            <node concept="3oM_SD" id="2Cji6ER9$7C" role="1PaTwD">
+              <property role="3oM_SC" value="type" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2Cji6ER9$bD" role="3cqZAp" />
+        <node concept="1nLNNL" id="2QSgdliKLcA" role="3cqZAp">
+          <node concept="1nLNMm" id="2QSgdliKLcB" role="1nLNNK">
+            <node concept="3Aq93q" id="2QSgdliKLcC" role="1nLNMb">
+              <property role="3ArMco" value="false" />
+              <node concept="3I6sU6" id="2QSgdliKLcD" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2QSgdliKLcE" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2QSgdliKLcF" role="3I6s78">
+                    <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
+                    <node concept="a7P8L" id="2QSgdliKLcG" role="3AunhB">
+                      <ref role="a7OzE" node="2QSgdliKLd1" resolve="T" />
+                    </node>
+                    <node concept="1HFMs5" id="2QSgdliKLcH" role="3AunhB">
+                      <node concept="a7P8L" id="2QSgdliKLcI" role="1uarlU">
+                        <ref role="a7OzE" node="2QSgdliKLcY" resolve="C" />
+                      </node>
+                      <node concept="ns1u0" id="2QSgdliKLcJ" role="1uarlW">
+                        <ref role="ns1xF" node="JOGAOsVt2j" resolve="captureOfType" />
+                        <node concept="nsMwS" id="2QSgdliKLcK" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt2n" resolve="lbound" />
+                          <node concept="1nq8_$" id="2QSgdliKM4$" role="nsMwV">
+                            <node concept="a7P8L" id="2QSgdliKM4C" role="1nq8_t">
+                              <ref role="a7OzE" node="2QSgdliKLd0" resolve="Lbnd" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="nsMwS" id="2QSgdliKLcN" role="ns1xD">
+                          <ref role="nsMwP" node="JOGAOsVt2m" resolve="ubound" />
+                          <node concept="1nq8_$" id="2QSgdliKLcO" role="nsMwV">
+                            <node concept="a7P8L" id="2QSgdliKLcP" role="1nq8_t">
+                              <ref role="a7OzE" node="2QSgdliKLcZ" resolve="Ubnd" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="0eUR_" id="2QSgdliKLcW" role="0UC6o">
+              <node concept="3NuqgR" id="2QSgdliKLcX" role="0eVf_">
+                <node concept="aZer4" id="2QSgdliKLcY" role="3XD1gS">
+                  <property role="TrG5h" value="C" />
+                </node>
+                <node concept="aZer4" id="2QSgdliKLcZ" role="3XD1gS">
+                  <property role="TrG5h" value="Ubnd" />
+                </node>
+                <node concept="aZer4" id="2QSgdliKLd0" role="3XD1gS">
+                  <property role="TrG5h" value="Lbnd" />
+                </node>
+                <node concept="aZer4" id="2QSgdliKLd1" role="3XD1gS">
+                  <property role="TrG5h" value="T" />
+                </node>
+                <node concept="aZer4" id="2QSgdliKLd2" role="3XD1gS">
+                  <property role="TrG5h" value="TBnd" />
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9E8" id="2QSgdliKLd3" role="1nLNMd">
+              <node concept="3I6sU6" id="2QSgdliKLd4" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2QSgdliKLd5" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2QSgdliKLd6" role="3I6s78">
+                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                    <node concept="a7P8L" id="2QSgdliKM54" role="3AunhB">
+                      <ref role="a7OzE" node="2QSgdliKLd0" resolve="Lbnd" />
+                    </node>
+                    <node concept="a7P8L" id="2QSgdliKM58" role="3AunhB">
+                      <ref role="a7OzE" node="2QSgdliKLd1" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3I6s7M" id="2QSgdliKM6K" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2QSgdliKM6I" role="3I6s78">
+                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
+                    <node concept="a7P8L" id="2QSgdliKM6W" role="3AunhB">
+                      <ref role="a7OzE" node="2QSgdliKLd1" resolve="T" />
+                    </node>
+                    <node concept="a7P8L" id="2QSgdliKM70" role="3AunhB">
+                      <ref role="a7OzE" node="2QSgdliKLcZ" resolve="Ubnd" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9_M" id="2QSgdliKLdd" role="1nLNMa">
+              <node concept="3I6sU6" id="2QSgdliKLde" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2QSgdliKM4L" role="3I6sU7">
+                  <node concept="2aM9Np" id="2QSgdliKM4H" role="3I6s78">
+                    <node concept="a7P8L" id="2QSgdliKM4O" role="2aLmnP">
+                      <ref role="a7OzE" node="2QSgdliKLd1" resolve="T" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="1nLNMY" id="12QmIo_7smh" role="1nK1Vg">
       <property role="TrG5h" value="upperBoundType_containedIn_upperBoundType" />
       <node concept="3clFbS" id="12QmIo_7smi" role="1nLNMH">
@@ -12254,459 +12391,6 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="2QSgdlite0m" role="1nK1Vg">
-      <property role="TrG5h" value="hasBound_containedIn_capture" />
-      <node concept="3clFbS" id="2QSgdlite0n" role="1nLNMH">
-        <node concept="1nLNNL" id="2QSgdlite0o" role="3cqZAp">
-          <node concept="1nLNMm" id="2QSgdlite0p" role="1nLNNK">
-            <node concept="3Aq93q" id="2QSgdlite0q" role="1nLNMb">
-              <property role="3ArMco" value="false" />
-              <node concept="3I6sU6" id="2QSgdlite0r" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdlite0s" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2QSgdlite0t" role="3I6s78">
-                    <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
-                    <node concept="a7P8L" id="2QSgdlitecC" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdlite0I" resolve="T" />
-                    </node>
-                    <node concept="1HFMs5" id="2QSgdlite0u" role="3AunhB">
-                      <node concept="a7P8L" id="2QSgdlite0v" role="1uarlU">
-                        <ref role="a7OzE" node="2QSgdlite0G" resolve="C" />
-                      </node>
-                      <node concept="ns1u0" id="2QSgdlite0w" role="1uarlW">
-                        <ref role="ns1xF" node="JOGAOsVt2j" resolve="captureOfType" />
-                        <node concept="nsMwS" id="2QSgdlixo92" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2n" resolve="lbound" />
-                          <node concept="1nq8_$" id="2QSgdlixo93" role="nsMwV">
-                            <node concept="ns1u0" id="2QSgdliKLcy" role="1nq8_t">
-                              <ref role="ns1xF" node="JOGAOsVt3c" resolve="nullType" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="nsMwS" id="2QSgdlite0x" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2m" resolve="ubound" />
-                          <node concept="1nq8_$" id="2QSgdlite0y" role="nsMwV">
-                            <node concept="a7P8L" id="2QSgdlite0z" role="1nq8_t">
-                              <ref role="a7OzE" node="2QSgdlite0H" resolve="Ubnd" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq93q" id="2QSgdlitecL" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="2QSgdlitecM" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdlited1" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2QSgdlited0" role="3I6s78">
-                    <ref role="3AqCNq" node="5310cdpUCuT" resolve="hasBound" />
-                    <node concept="a7P8L" id="2QSgdlitedb" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdlite0I" resolve="T" />
-                    </node>
-                    <node concept="a7P8L" id="2QSgdlitedf" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdlite0J" resolve="TBnd" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="0eUR_" id="2QSgdlite0E" role="0UC6o">
-              <node concept="3NuqgR" id="2QSgdlite0F" role="0eVf_">
-                <node concept="aZer4" id="2QSgdlite0G" role="3XD1gS">
-                  <property role="TrG5h" value="C" />
-                </node>
-                <node concept="aZer4" id="2QSgdlite0H" role="3XD1gS">
-                  <property role="TrG5h" value="Ubnd" />
-                </node>
-                <node concept="aZer4" id="2QSgdlixo9b" role="3XD1gS">
-                  <property role="TrG5h" value="Lbnd" />
-                </node>
-                <node concept="aZer4" id="2QSgdlite0I" role="3XD1gS">
-                  <property role="TrG5h" value="T" />
-                </node>
-                <node concept="aZer4" id="2QSgdlite0J" role="3XD1gS">
-                  <property role="TrG5h" value="TBnd" />
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9E8" id="2QSgdlite0K" role="1nLNMd">
-              <node concept="3I6sU6" id="2QSgdlite0L" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdlite0M" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2QSgdlite0N" role="3I6s78">
-                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                    <node concept="a7P8L" id="2QSgdlite0P" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdlite0J" resolve="TBnd" />
-                    </node>
-                    <node concept="a7P8L" id="2QSgdlizskK" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdlite0H" resolve="Ubnd" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="2QSgdliteeh" role="3I6sU7">
-                  <node concept="3A8Hvi" id="2QSgdliteeb" role="3I6s78">
-                    <node concept="a7P8L" id="2QSgdliteeq" role="3A8wtg">
-                      <ref role="a7OzE" node="2QSgdlite0G" resolve="C" />
-                    </node>
-                    <node concept="a7P8L" id="2QSgdliteet" role="3A8w4Q">
-                      <ref role="a7OzE" node="2QSgdlite0I" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9_M" id="2QSgdlitedV" role="1nLNMa">
-              <node concept="3I6sU6" id="2QSgdlitedW" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdlitee0" role="3I6sU7">
-                  <node concept="2aLmEc" id="2QSgdlitedZ" role="3I6s78">
-                    <node concept="a7P8L" id="2QSgdlitee3" role="2aLmnP">
-                      <ref role="a7OzE" node="2QSgdlite0I" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1nLNMY" id="2QSgdliKKYy" role="1nK1Vg">
-      <property role="TrG5h" value="capture_containedIn_hasbound" />
-      <node concept="3clFbS" id="2QSgdliKKYz" role="1nLNMH">
-        <node concept="1nLNNL" id="2QSgdliKKY$" role="3cqZAp">
-          <node concept="1nLNMm" id="2QSgdliKKY_" role="1nLNNK">
-            <node concept="3Aq93q" id="2QSgdliKKYA" role="1nLNMb">
-              <property role="3ArMco" value="false" />
-              <node concept="3I6sU6" id="2QSgdliKKYB" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdliKKYC" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2QSgdliKKYD" role="3I6s78">
-                    <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
-                    <node concept="1HFMs5" id="2QSgdliKKYE" role="3AunhB">
-                      <node concept="a7P8L" id="2QSgdliKKYF" role="1uarlU">
-                        <ref role="a7OzE" node="2QSgdliKKYW" resolve="C" />
-                      </node>
-                      <node concept="ns1u0" id="2QSgdliKKYG" role="1uarlW">
-                        <ref role="ns1xF" node="JOGAOsVt2j" resolve="captureOfType" />
-                        <node concept="nsMwS" id="2QSgdliKKYH" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2n" resolve="lbound" />
-                          <node concept="1nq8_$" id="2QSgdliKKYI" role="nsMwV">
-                            <node concept="a7P8L" id="2QSgdliKKYJ" role="1nq8_t">
-                              <ref role="a7OzE" node="2QSgdliKKYY" resolve="Lbnd" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="nsMwS" id="2QSgdliKKYK" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2m" resolve="ubound" />
-                          <node concept="1nq8_$" id="2QSgdliKKYL" role="nsMwV">
-                            <node concept="a7P8L" id="2QSgdliKKYM" role="1nq8_t">
-                              <ref role="a7OzE" node="2QSgdliKKYX" resolve="Ubnd" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="a7P8L" id="2QSgdliKKYN" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdliKKYZ" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq93q" id="2QSgdliKKYO" role="1nLNMb">
-              <property role="3ArMco" value="true" />
-              <node concept="3I6sU6" id="2QSgdliKKYP" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdliKKYQ" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2QSgdliKKYR" role="3I6s78">
-                    <ref role="3AqCNq" node="5310cdpUCuT" resolve="hasBound" />
-                    <node concept="a7P8L" id="2QSgdliKKYS" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdliKKYZ" resolve="T" />
-                    </node>
-                    <node concept="a7P8L" id="2QSgdliKKYT" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdliKKZ0" resolve="TBnd" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="0eUR_" id="2QSgdliKKYU" role="0UC6o">
-              <node concept="3NuqgR" id="2QSgdliKKYV" role="0eVf_">
-                <node concept="aZer4" id="2QSgdliKKYW" role="3XD1gS">
-                  <property role="TrG5h" value="C" />
-                </node>
-                <node concept="aZer4" id="2QSgdliKKYX" role="3XD1gS">
-                  <property role="TrG5h" value="Ubnd" />
-                </node>
-                <node concept="aZer4" id="2QSgdliKKYY" role="3XD1gS">
-                  <property role="TrG5h" value="Lbnd" />
-                </node>
-                <node concept="aZer4" id="2QSgdliKKYZ" role="3XD1gS">
-                  <property role="TrG5h" value="T" />
-                </node>
-                <node concept="aZer4" id="2QSgdliKKZ0" role="3XD1gS">
-                  <property role="TrG5h" value="TBnd" />
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9E8" id="2QSgdliKKZ1" role="1nLNMd">
-              <node concept="3I6sU6" id="2QSgdliKKZ2" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdliKKZ3" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2QSgdliKKZ4" role="3I6s78">
-                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                    <node concept="a7P8L" id="2QSgdliKKZ5" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdliKKYX" resolve="Ubnd" />
-                    </node>
-                    <node concept="a7P8L" id="2QSgdliKKZ6" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdliKKZ0" resolve="TBnd" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="2QSgdliKKZ7" role="3I6sU7">
-                  <node concept="3A8Hvi" id="2QSgdliKKZ8" role="3I6s78">
-                    <node concept="a7P8L" id="2QSgdliKKZ9" role="3A8wtg">
-                      <ref role="a7OzE" node="2QSgdliKKYW" resolve="C" />
-                    </node>
-                    <node concept="a7P8L" id="2QSgdliKKZa" role="3A8w4Q">
-                      <ref role="a7OzE" node="2QSgdliKKYZ" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9_M" id="2QSgdliKKZb" role="1nLNMa">
-              <node concept="3I6sU6" id="2QSgdliKKZc" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdliKKZd" role="3I6sU7">
-                  <node concept="2aLmEc" id="2QSgdliKKZe" role="3I6s78">
-                    <node concept="a7P8L" id="2QSgdliKKZf" role="2aLmnP">
-                      <ref role="a7OzE" node="2QSgdliKKYZ" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1X3_iC" id="2Cji6ER7C3A" role="lGtFl">
-      <property role="3V$3am" value="template" />
-      <property role="3V$3ak" value="c4803b19-6d89-4a3b-bf82-390769514add/8335224865066015764/3575255234175157601" />
-      <node concept="1nLNMY" id="2QSgdlip8NO" role="8Wnug">
-        <property role="TrG5h" value="typeVar_containedIn_capture" />
-        <node concept="3clFbS" id="2QSgdlip8NP" role="1nLNMH">
-          <node concept="3SKdUt" id="2Cji6ER7ChF" role="3cqZAp">
-            <node concept="1PaTwC" id="2Cji6ER7ChG" role="3ndbpf">
-              <node concept="3oM_SD" id="2Cji6ER7ChI" role="1PaTwD">
-                <property role="3oM_SC" value="covered" />
-              </node>
-              <node concept="3oM_SD" id="2Cji6ER7Cim" role="1PaTwD">
-                <property role="3oM_SC" value="by" />
-              </node>
-              <node concept="3oM_SD" id="2Cji6ER7Cip" role="1PaTwD">
-                <property role="3oM_SC" value="the" />
-              </node>
-              <node concept="3oM_SD" id="2Cji6ER7Cit" role="1PaTwD">
-                <property role="3oM_SC" value="next" />
-              </node>
-              <node concept="3oM_SD" id="2Cji6ER7Ciy" role="1PaTwD">
-                <property role="3oM_SC" value="rule" />
-              </node>
-            </node>
-          </node>
-          <node concept="3clFbH" id="2Cji6ER7CiC" role="3cqZAp" />
-          <node concept="1nLNNL" id="2QSgdlip8Yq" role="3cqZAp">
-            <node concept="1nLNMm" id="2QSgdlip8Yr" role="1nLNNK">
-              <node concept="3Aq93q" id="2QSgdlip8Yu" role="1nLNMb">
-                <property role="3ArMco" value="false" />
-                <node concept="3I6sU6" id="2QSgdlip8Yv" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="2QSgdlip8Yz" role="3I6sU7">
-                    <node concept="3Aqt3T" id="2QSgdlip8Yy" role="3I6s78">
-                      <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
-                      <node concept="1HFMs5" id="2QSgdlir9wh" role="3AunhB">
-                        <node concept="a7P8L" id="2QSgdlip8Zy" role="1uarlU">
-                          <ref role="a7OzE" node="2QSgdlip8YJ" resolve="T" />
-                        </node>
-                        <node concept="ns1u0" id="2QSgdlir9wx" role="1uarlW">
-                          <ref role="ns1xF" node="JOGAOsVt2f" resolve="typeVariableType" />
-                          <node concept="nsMwS" id="2QSgdlir9wz" role="ns1xD">
-                            <ref role="nsMwP" node="39Sam6ZibY7" resolve="parameter" />
-                            <node concept="1nq8_$" id="2QSgdlir9wI" role="nsMwV">
-                              <node concept="a7P8L" id="2QSgdlir9wG" role="1nq8_t">
-                                <ref role="a7OzE" node="2QSgdlir9wB" resolve="TBnd" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                      <node concept="1HFMs5" id="2QSgdlip8YQ" role="3AunhB">
-                        <node concept="a7P8L" id="2QSgdlip8YM" role="1uarlU">
-                          <ref role="a7OzE" node="2QSgdlip8YG" resolve="C" />
-                        </node>
-                        <node concept="ns1u0" id="2QSgdlip8YX" role="1uarlW">
-                          <ref role="ns1xF" node="JOGAOsVt2j" resolve="captureOfType" />
-                          <node concept="nsMwS" id="2QSgdlixo8M" role="ns1xD">
-                            <ref role="nsMwP" node="JOGAOsVt2n" resolve="lbound" />
-                            <node concept="1nq8_$" id="2QSgdlixo8N" role="nsMwV">
-                              <node concept="ns1u0" id="2QSgdliKKYw" role="1nq8_t">
-                                <ref role="ns1xF" node="JOGAOsVt3c" resolve="nullType" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="nsMwS" id="2QSgdlip8YZ" role="ns1xD">
-                            <ref role="nsMwP" node="JOGAOsVt2m" resolve="ubound" />
-                            <node concept="1nq8_$" id="2QSgdlip8Z9" role="nsMwV">
-                              <node concept="a7P8L" id="2QSgdlip8Z7" role="1nq8_t">
-                                <ref role="a7OzE" node="2QSgdlip8Z3" resolve="Ubnd" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="0eUR_" id="2QSgdlip8YD" role="0UC6o">
-                <node concept="3NuqgR" id="2QSgdlip8YF" role="0eVf_">
-                  <node concept="aZer4" id="2QSgdlip8YG" role="3XD1gS">
-                    <property role="TrG5h" value="C" />
-                  </node>
-                  <node concept="aZer4" id="2QSgdlip8Z3" role="3XD1gS">
-                    <property role="TrG5h" value="Ubnd" />
-                  </node>
-                  <node concept="aZer4" id="2QSgdlixo8G" role="3XD1gS">
-                    <property role="TrG5h" value="Lbnd" />
-                  </node>
-                  <node concept="aZer4" id="2QSgdlip8YJ" role="3XD1gS">
-                    <property role="TrG5h" value="T" />
-                  </node>
-                  <node concept="aZer4" id="2QSgdlir9wB" role="3XD1gS">
-                    <property role="TrG5h" value="TBnd" />
-                  </node>
-                </node>
-              </node>
-              <node concept="3Aq9E8" id="2QSgdlip8ZF" role="1nLNMd">
-                <node concept="3I6sU6" id="2QSgdlip8ZG" role="3Ip0Jz">
-                  <node concept="3I6s7M" id="2QSgdlip8ZK" role="3I6sU7">
-                    <node concept="3Aqt3T" id="2QSgdlip8ZJ" role="3I6s78">
-                      <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                      <node concept="a7P8L" id="2QSgdlir9wL" role="3AunhB">
-                        <ref role="a7OzE" node="2QSgdlir9wB" resolve="TBnd" />
-                      </node>
-                      <node concept="a7P8L" id="2QSgdlizskG" role="3AunhB">
-                        <ref role="a7OzE" node="2QSgdlip8Z3" resolve="Ubnd" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="1nLNMY" id="2QSgdliKLc$" role="1nK1Vg">
-      <property role="TrG5h" value="value_containedIn_capture" />
-      <node concept="3clFbS" id="2QSgdliKLc_" role="1nLNMH">
-        <node concept="1nLNNL" id="2QSgdliKLcA" role="3cqZAp">
-          <node concept="1nLNMm" id="2QSgdliKLcB" role="1nLNNK">
-            <node concept="3Aq93q" id="2QSgdliKLcC" role="1nLNMb">
-              <property role="3ArMco" value="false" />
-              <node concept="3I6sU6" id="2QSgdliKLcD" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdliKLcE" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2QSgdliKLcF" role="3I6s78">
-                    <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
-                    <node concept="a7P8L" id="2QSgdliKLcG" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdliKLd1" resolve="T" />
-                    </node>
-                    <node concept="1HFMs5" id="2QSgdliKLcH" role="3AunhB">
-                      <node concept="a7P8L" id="2QSgdliKLcI" role="1uarlU">
-                        <ref role="a7OzE" node="2QSgdliKLcY" resolve="C" />
-                      </node>
-                      <node concept="ns1u0" id="2QSgdliKLcJ" role="1uarlW">
-                        <ref role="ns1xF" node="JOGAOsVt2j" resolve="captureOfType" />
-                        <node concept="nsMwS" id="2QSgdliKLcK" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2n" resolve="lbound" />
-                          <node concept="1nq8_$" id="2QSgdliKM4$" role="nsMwV">
-                            <node concept="a7P8L" id="2QSgdliKM4C" role="1nq8_t">
-                              <ref role="a7OzE" node="2QSgdliKLd0" resolve="Lbnd" />
-                            </node>
-                          </node>
-                        </node>
-                        <node concept="nsMwS" id="2QSgdliKLcN" role="ns1xD">
-                          <ref role="nsMwP" node="JOGAOsVt2m" resolve="ubound" />
-                          <node concept="1nq8_$" id="2QSgdliKLcO" role="nsMwV">
-                            <node concept="a7P8L" id="2QSgdliKLcP" role="1nq8_t">
-                              <ref role="a7OzE" node="2QSgdliKLcZ" resolve="Ubnd" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="0eUR_" id="2QSgdliKLcW" role="0UC6o">
-              <node concept="3NuqgR" id="2QSgdliKLcX" role="0eVf_">
-                <node concept="aZer4" id="2QSgdliKLcY" role="3XD1gS">
-                  <property role="TrG5h" value="C" />
-                </node>
-                <node concept="aZer4" id="2QSgdliKLcZ" role="3XD1gS">
-                  <property role="TrG5h" value="Ubnd" />
-                </node>
-                <node concept="aZer4" id="2QSgdliKLd0" role="3XD1gS">
-                  <property role="TrG5h" value="Lbnd" />
-                </node>
-                <node concept="aZer4" id="2QSgdliKLd1" role="3XD1gS">
-                  <property role="TrG5h" value="T" />
-                </node>
-                <node concept="aZer4" id="2QSgdliKLd2" role="3XD1gS">
-                  <property role="TrG5h" value="TBnd" />
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9E8" id="2QSgdliKLd3" role="1nLNMd">
-              <node concept="3I6sU6" id="2QSgdliKLd4" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdliKLd5" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2QSgdliKLd6" role="3I6s78">
-                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                    <node concept="a7P8L" id="2QSgdliKM54" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdliKLd0" resolve="Lbnd" />
-                    </node>
-                    <node concept="a7P8L" id="2QSgdliKM58" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdliKLd1" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="2QSgdliKM6K" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2QSgdliKM6I" role="3I6s78">
-                    <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                    <node concept="a7P8L" id="2QSgdliKM6W" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdliKLd1" resolve="T" />
-                    </node>
-                    <node concept="a7P8L" id="2QSgdliKM70" role="3AunhB">
-                      <ref role="a7OzE" node="2QSgdliKLcZ" resolve="Ubnd" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9_M" id="2QSgdliKLdd" role="1nLNMa">
-              <node concept="3I6sU6" id="2QSgdliKLde" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2QSgdliKM4L" role="3I6sU7">
-                  <node concept="2aM9Np" id="2QSgdliKM4H" role="3I6s78">
-                    <node concept="a7P8L" id="2QSgdliKM4O" role="2aLmnP">
-                      <ref role="a7OzE" node="2QSgdliKLd1" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="1nLNMY" id="12QmIo_7sm_" role="1nK1Vg">
       <property role="TrG5h" value="any_containedIn_upperBoundType" />
       <node concept="3clFbS" id="12QmIo_7smA" role="1nLNMH">
@@ -12715,13 +12399,13 @@
             <node concept="0eUR_" id="7lt0LtPBjTU" role="0UC6o">
               <node concept="3NuqgR" id="4nb5sv4v7X" role="0eVf_">
                 <node concept="aZer4" id="4nb5sv4v7Y" role="3XD1gS">
-                  <property role="TrG5h" value="T" />
+                  <property role="TrG5h" value="Type" />
                 </node>
                 <node concept="aZer4" id="4nb5sv4v7Z" role="3XD1gS">
-                  <property role="TrG5h" value="UpperBound" />
+                  <property role="TrG5h" value="UBType" />
                 </node>
                 <node concept="aZer4" id="4nb5sv4v80" role="3XD1gS">
-                  <property role="TrG5h" value="Bnd" />
+                  <property role="TrG5h" value="UBnd" />
                 </node>
               </node>
             </node>
@@ -12732,7 +12416,7 @@
                   <node concept="3Aqt3T" id="4nb5sv4v83" role="3I6s78">
                     <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
                     <node concept="a7P8L" id="4nb5sv4v84" role="3AunhB">
-                      <ref role="a7OzE" node="4nb5sv4v7Y" resolve="T" />
+                      <ref role="a7OzE" node="4nb5sv4v7Y" resolve="Type" />
                     </node>
                     <node concept="1HFMs5" id="1mdVbTSaq2L" role="3AunhB">
                       <node concept="ns1u0" id="JOGAOsVtbq" role="1uarlW">
@@ -12741,13 +12425,13 @@
                           <ref role="nsMwP" node="39Sam6YgyvP" resolve="parameter" />
                           <node concept="1nq8_$" id="49obaclfijg" role="nsMwV">
                             <node concept="a7P8L" id="4nb5sv4v8e" role="1nq8_t">
-                              <ref role="a7OzE" node="4nb5sv4v80" resolve="Bnd" />
+                              <ref role="a7OzE" node="4nb5sv4v80" resolve="UBnd" />
                             </node>
                           </node>
                         </node>
                       </node>
                       <node concept="a7P8L" id="4nb5sv4v86" role="1uarlU">
-                        <ref role="a7OzE" node="4nb5sv4v7Z" resolve="UpperBound" />
+                        <ref role="a7OzE" node="4nb5sv4v7Z" resolve="UBType" />
                       </node>
                     </node>
                   </node>
@@ -12760,10 +12444,10 @@
                   <node concept="3Aqt3T" id="4nb5sv4v7T" role="3I6s78">
                     <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
                     <node concept="a7P8L" id="4nb5sv4v7U" role="3AunhB">
-                      <ref role="a7OzE" node="4nb5sv4v7Y" resolve="T" />
+                      <ref role="a7OzE" node="4nb5sv4v7Y" resolve="Type" />
                     </node>
                     <node concept="a7P8L" id="4nb5sv4v7V" role="3AunhB">
-                      <ref role="a7OzE" node="4nb5sv4v80" resolve="Bnd" />
+                      <ref role="a7OzE" node="4nb5sv4v80" resolve="UBnd" />
                     </node>
                   </node>
                 </node>
@@ -12839,106 +12523,6 @@
         </node>
       </node>
     </node>
-    <node concept="1nLNMY" id="12QmIo_7slT" role="1nK1Vg">
-      <property role="TrG5h" value="value_containedIn_var_noUbound" />
-      <node concept="3clFbS" id="12QmIo_7slU" role="1nLNMH">
-        <node concept="3SKdUt" id="2Cji6ER7sRy" role="3cqZAp">
-          <node concept="1PaTwC" id="2Cji6ER7sRz" role="3ndbpf">
-            <node concept="3oM_SD" id="2Cji6ER7sR_" role="1PaTwD">
-              <property role="3oM_SC" value="fixme:" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER7sS7" role="1PaTwD">
-              <property role="3oM_SC" value="suspicious" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER7sSa" role="1PaTwD">
-              <property role="3oM_SC" value="rule," />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER7sSe" role="1PaTwD">
-              <property role="3oM_SC" value="free" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER7sSj" role="1PaTwD">
-              <property role="3oM_SC" value="vars" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER7sSp" role="1PaTwD">
-              <property role="3oM_SC" value="must" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER7sSw" role="1PaTwD">
-              <property role="3oM_SC" value="have" />
-            </node>
-            <node concept="3oM_SD" id="2Cji6ER7sSC" role="1PaTwD">
-              <property role="3oM_SC" value="bounds" />
-            </node>
-          </node>
-        </node>
-        <node concept="1nLNNL" id="12QmIo_7slV" role="3cqZAp">
-          <node concept="1nLNMm" id="12QmIo_7slW" role="1nLNNK">
-            <node concept="0eUR_" id="7lt0LtPBjUn" role="0UC6o">
-              <node concept="3NuqgR" id="2BbfRGC8W2l" role="0eVf_">
-                <node concept="aZer4" id="2BbfRGC8W2m" role="3XD1gS">
-                  <property role="TrG5h" value="Object" />
-                </node>
-              </node>
-              <node concept="3NuqgR" id="2BbfRGC8VOb" role="0eVf_">
-                <node concept="aZer4" id="2BbfRGC8VOc" role="3XD1gS">
-                  <property role="TrG5h" value="S" />
-                </node>
-                <node concept="aZer4" id="2BbfRGC8VOd" role="3XD1gS">
-                  <property role="TrG5h" value="T" />
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq93q" id="2BbfRGC8VOa" role="1nLNMb">
-              <property role="3ArMco" value="false" />
-              <node concept="3I6sU6" id="2BbfRGC8VOe" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2BbfRGC8VOf" role="3I6sU7">
-                  <node concept="3Aqt3T" id="2BbfRGC8VOg" role="3I6s78">
-                    <ref role="3AqCNq" node="6KkyQm4aRV3" resolve="containedIn" />
-                    <node concept="a7P8L" id="2BbfRGC8VOh" role="3AunhB">
-                      <ref role="a7OzE" node="2BbfRGC8VOc" resolve="S" />
-                    </node>
-                    <node concept="a7P8L" id="2BbfRGC8VOi" role="3AunhB">
-                      <ref role="a7OzE" node="2BbfRGC8VOd" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9_M" id="2BbfRGC8VO2" role="1nLNMa">
-              <node concept="3I6sU6" id="2BbfRGC8VO3" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2BbfRGC8VO4" role="3I6sU7">
-                  <node concept="2aM9Np" id="2BbfRGC8VO5" role="3I6s78">
-                    <node concept="a7P8L" id="2BbfRGC8VO6" role="2aLmnP">
-                      <ref role="a7OzE" node="2BbfRGC8VOc" resolve="S" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="3I6s7M" id="2BbfRGC8VO7" role="3I6sU7">
-                  <node concept="2aLmEc" id="2BbfRGC8VO8" role="3I6s78">
-                    <node concept="a7P8L" id="2BbfRGC8VO9" role="2aLmnP">
-                      <ref role="a7OzE" node="2BbfRGC8VOd" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3Aq9E8" id="2BbfRGC8VNS" role="1nLNMd">
-              <node concept="3I6sU6" id="2BbfRGC8VNT" role="3Ip0Jz">
-                <node concept="3I6s7M" id="2BbfRGC8VNU" role="3I6sU7">
-                  <node concept="3A8Hvi" id="2BbfRGC8VNV" role="3I6s78">
-                    <node concept="a7P8L" id="2BbfRGC8VNW" role="3A8wtg">
-                      <ref role="a7OzE" node="2BbfRGC8VOc" resolve="S" />
-                    </node>
-                    <node concept="a7P8L" id="2BbfRGC8VNX" role="3A8w4Q">
-                      <ref role="a7OzE" node="2BbfRGC8VOd" resolve="T" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
     <node concept="1nLNMY" id="12QmIo_7smH" role="1nK1Vg">
       <property role="TrG5h" value="containedIn_catchAll" />
       <node concept="3clFbS" id="12QmIo_7smI" role="1nLNMH">
@@ -17455,7 +17039,7 @@
       </node>
     </node>
     <node concept="1nLNMY" id="1fKFQTSrPcv" role="1nK1Vg">
-      <property role="TrG5h" value="converts_any_upperBoundType" />
+      <property role="TrG5h" value="converts_upperBoundType_any" />
       <node concept="3clFbS" id="1fKFQTSrPcw" role="1nLNMH">
         <node concept="1nLNNL" id="1fKFQTSrPcx" role="3cqZAp">
           <node concept="1nLNMm" id="1fKFQTSrPcy" role="1nLNNK">
diff --git a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
index 06fad5f2..8f5e46d9 100644
--- a/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
+++ b/samples/mpscore/solutions/jetbrains.mps.baseLanguageExt.test/models/jetbrains.mps.baseLanguageExt.test.code.generics.mps
@@ -1695,7 +1695,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="2PEDwPSdgqw" role="jymVt" />
-    <node concept="2tJIrI" id="2PEDwPSdka7" role="jymVt" />
     <node concept="2tJIrI" id="2PEDwPSdbcl" role="jymVt" />
     <node concept="312cEu" id="2PEDwPSdka8" role="jymVt">
       <property role="TrG5h" value="Demo" />
@@ -2255,6 +2254,15 @@
             </node>
           </node>
         </node>
+        <node concept="37vLTG" id="2Cji6ER9GNr" role="3clF46">
+          <property role="TrG5h" value="eTSer" />
+          <node concept="3uibUv" id="2Cji6ER9H2K" role="1tU5fm">
+            <ref role="3uigEE" node="2PEDwPSdka2" resolve="Containment.E" />
+            <node concept="16syzq" id="2Cji6ER9Hcw" role="11_B2D">
+              <ref role="16sUi3" node="2Cji6ER9FVq" resolve="TSer" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbS" id="2Cji6ER7duE" role="3clF47">
           <node concept="3SKdUt" id="2Cji6ER7duF" role="3cqZAp">
             <node concept="1PaTwC" id="2Cji6ER7duG" role="3ndbpf">
@@ -2329,9 +2337,106 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="2Cji6ER9IZ8" role="3cqZAp">
+            <node concept="37vLTI" id="2Cji6ER9Jia" role="3clFbG">
+              <node concept="37vLTw" id="2Cji6ER9JuE" role="37vLTx">
+                <ref role="3cqZAo" node="2Cji6ER9GNr" resolve="eTSer" />
+              </node>
+              <node concept="37vLTw" id="2Cji6ER9IZ6" role="37vLTJ">
+                <ref role="3cqZAo" node="2Cji6ER7duv" resolve="eeSer" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2Cji6ER9S$l" role="3cqZAp">
+            <node concept="37vLTI" id="2Cji6ER9SOP" role="3clFbG">
+              <node concept="37vLTw" id="2Cji6ER9SXd" role="37vLTx">
+                <ref role="3cqZAo" node="2Cji6ER7duv" resolve="eeSer" />
+              </node>
+              <node concept="37vLTw" id="2Cji6ER9S$j" role="37vLTJ">
+                <ref role="3cqZAo" node="2Cji6ER9GNr" resolve="eTSer" />
+              </node>
+              <node concept="1U20sH" id="2Cji6ER9T9D" role="lGtFl">
+                <property role="1U20sK" value="error" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2Cji6ER9IR6" role="3cqZAp" />
+          <node concept="3clFbF" id="2Cji6ER9DgY" role="3cqZAp">
+            <node concept="2OqwBi" id="2Cji6ER9Dog" role="3clFbG">
+              <node concept="37vLTw" id="2Cji6ER9DgW" role="2Oq$k0">
+                <ref role="3cqZAo" node="2Cji6ER7duv" resolve="eeSer" />
+              </node>
+              <node concept="liA8E" id="2Cji6ER9D$I" role="2OqNvi">
+                <ref role="37wK5l" node="2PEDwPSdk9O" resolve="add" />
+                <node concept="2OqwBi" id="2Cji6ER9DV3" role="37wK5m">
+                  <node concept="37vLTw" id="2Cji6ER9DJD" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2Cji6ER7dus" resolve="eStr" />
+                  </node>
+                  <node concept="liA8E" id="2Cji6ER9E82" role="2OqNvi">
+                    <ref role="37wK5l" node="4ObboSeq3Tj" resolve="get" />
+                  </node>
+                  <node concept="1U20sH" id="2Cji6ER9OKX" role="lGtFl">
+                    <property role="1U20sK" value="error" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2Cji6ER9EB_" role="3cqZAp">
+            <node concept="2OqwBi" id="2Cji6ER9EKi" role="3clFbG">
+              <node concept="37vLTw" id="2Cji6ER9EBz" role="2Oq$k0">
+                <ref role="3cqZAo" node="2Cji6ER7duv" resolve="eeSer" />
+              </node>
+              <node concept="liA8E" id="2Cji6ER9ETz" role="2OqNvi">
+                <ref role="37wK5l" node="2PEDwPSdk9O" resolve="add" />
+                <node concept="2OqwBi" id="2Cji6ER9Igg" role="37wK5m">
+                  <node concept="37vLTw" id="2Cji6ER9HU$" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2Cji6ER9GNr" resolve="eTSer" />
+                  </node>
+                  <node concept="liA8E" id="2Cji6ER9Ipv" role="2OqNvi">
+                    <ref role="37wK5l" node="4ObboSeq3Tj" resolve="get" />
+                  </node>
+                  <node concept="1U20sH" id="2Cji6ER9P0j" role="lGtFl">
+                    <property role="1U20sK" value="error" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbH" id="2Cji6ERioZs" role="3cqZAp" />
+          <node concept="3clFbF" id="2Cji6ERiqff" role="3cqZAp">
+            <node concept="1rXfSq" id="2Cji6ERiqfg" role="3clFbG">
+              <ref role="37wK5l" node="2Cji6ERinnP" resolve="callMe2" />
+              <node concept="37vLTw" id="2Cji6ERiqfh" role="37wK5m">
+                <ref role="3cqZAo" node="2Cji6ER7dus" resolve="eStr" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2Cji6ERipT3" role="3cqZAp">
+            <node concept="1rXfSq" id="2Cji6ERipT1" role="3clFbG">
+              <ref role="37wK5l" node="2Cji6ERinnP" resolve="callMe2" />
+              <node concept="37vLTw" id="2Cji6ERiqAp" role="37wK5m">
+                <ref role="3cqZAo" node="2Cji6ER7duy" resolve="eeStr" />
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2Cji6ERipff" role="3cqZAp">
+            <node concept="1rXfSq" id="2Cji6ERipfd" role="3clFbG">
+              <ref role="37wK5l" node="2Cji6ERinnP" resolve="callMe2" />
+              <node concept="37vLTw" id="2Cji6ERiptT" role="37wK5m">
+                <ref role="3cqZAo" node="2Cji6ER9GNr" resolve="eTSer" />
+              </node>
+            </node>
+          </node>
         </node>
         <node concept="3Tm1VV" id="2Cji6ER7dvr" role="1B3o_S" />
         <node concept="3cqZAl" id="2Cji6ER7dvs" role="3clF45" />
+        <node concept="16euLQ" id="2Cji6ER9FVq" role="16eVyc">
+          <property role="TrG5h" value="TSer" />
+          <node concept="3uibUv" id="2Cji6ER9Gox" role="3ztrMU">
+            <ref role="3uigEE" to="guwi:~Serializable" resolve="Serializable" />
+          </node>
+        </node>
       </node>
       <node concept="2tJIrI" id="2Cji6ER51QH" role="jymVt" />
       <node concept="3clFb_" id="2Cji6ER51uE" role="jymVt">
@@ -2481,22 +2586,7 @@
               </node>
             </node>
           </node>
-          <node concept="3SKdUt" id="2Cji6ER7dnR" role="3cqZAp">
-            <node concept="1PaTwC" id="2Cji6ER7dnS" role="3ndbpf">
-              <node concept="3oM_SD" id="2Cji6ER7dnU" role="1PaTwD">
-                <property role="3oM_SC" value="todo:" />
-              </node>
-              <node concept="3oM_SD" id="2Cji6ER7drN" role="1PaTwD">
-                <property role="3oM_SC" value="test" />
-              </node>
-              <node concept="3oM_SD" id="2Cji6ER7drQ" role="1PaTwD">
-                <property role="3oM_SC" value="super" />
-              </node>
-              <node concept="3oM_SD" id="2Cji6ER7dsy" role="1PaTwD">
-                <property role="3oM_SC" value="capture" />
-              </node>
-            </node>
-          </node>
+          <node concept="3clFbH" id="2Cji6ER9s$t" role="3cqZAp" />
           <node concept="3clFbF" id="2Cji6ER51uZ" role="3cqZAp">
             <node concept="2OqwBi" id="2Cji6ER51v0" role="3clFbG">
               <node concept="37vLTw" id="2Cji6ER5pi0" role="2Oq$k0">
@@ -2649,6 +2739,29 @@
         </node>
       </node>
       <node concept="2tJIrI" id="4ObboSeqcmw" role="jymVt" />
+      <node concept="3clFb_" id="2Cji6ERinnP" role="jymVt">
+        <property role="TrG5h" value="callMe2" />
+        <node concept="3clFbS" id="2Cji6ERinnS" role="3clF47" />
+        <node concept="3Tm1VV" id="2Cji6ERimWP" role="1B3o_S" />
+        <node concept="3cqZAl" id="2Cji6ERinBA" role="3clF45" />
+        <node concept="16euLQ" id="2Cji6ERinRx" role="16eVyc">
+          <property role="TrG5h" value="S" />
+          <node concept="3uibUv" id="2Cji6ERiobv" role="3ztrMU">
+            <ref role="3uigEE" node="2PEDwPSdka2" resolve="Containment.E" />
+            <node concept="3qUE_q" id="2Cji6ERiodM" role="11_B2D">
+              <node concept="3uibUv" id="2Cji6ERiolB" role="3qUE_r">
+                <ref role="3uigEE" to="guwi:~Serializable" resolve="Serializable" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="2Cji6ERiopL" role="3clF46">
+          <property role="TrG5h" value="s" />
+          <node concept="16syzq" id="2Cji6ERiopK" role="1tU5fm">
+            <ref role="16sUi3" node="2Cji6ERinRx" resolve="S" />
+          </node>
+        </node>
+      </node>
       <node concept="2tJIrI" id="4ObboSeF_gC" role="jymVt" />
       <node concept="3clFb_" id="4ObboSeETwX" role="jymVt">
         <property role="TrG5h" value="partialInference" />