From 76c6ee052a2fd420eaf8963f6e2789a1016e5d63 Mon Sep 17 00:00:00 2001
From: Grigorii Kirgizov <grigorii.kirgizov@jetbrains.com>
Date: Wed, 11 Dec 2019 16:55:32 +0300
Subject: [PATCH] Switch error reporting on arg types from 'origin' to
 'convertsToSafe' in method call rules.

'origin' works only when wrapping whole ConstraintRule-s, not individual constraint activation statements.
---
 .../jetbrains.mps.baseLanguageExt.types.mps   | 436 ++++++++++--------
 ...mps.baseLanguageExt.test.code.generics.mps | 369 +++++++++------
 2 files changed, 466 insertions(+), 339 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 41a56325..433f3c6c 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
@@ -6243,108 +6243,123 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3Hbl2A" id="5Oz70LKgMKO" role="3cqZAp">
-                                    <node concept="3clFbS" id="5Oz70LKgMKQ" role="9aQI4">
-                                      <node concept="3Aqczg" id="3R6X$QWoei1" role="3cqZAp">
-                                        <node concept="3Aqt3T" id="3R6X$QWoehZ" role="3Aqpz8">
-                                          <ref role="3AqCNq" node="3R6X$QWo8$D" resolve="captureVar" />
-                                          <node concept="a7P8L" id="3R6X$QWohfr" role="3AunhB">
-                                            <ref role="a7OzE" node="3R6X$QWoi1O" resolve="CapTyArgs" />
-                                            <node concept="37vLTw" id="3R6X$QWohjB" role="3gCZO6">
-                                              <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
-                                            </node>
-                                          </node>
-                                          <node concept="a7P8L" id="3R6X$QWo$rC" role="3AunhB">
-                                            <ref role="a7OzE" node="6EY0p2wFugP" resolve="TyArg" />
-                                            <node concept="37vLTw" id="3R6X$QWo$vE" role="3gCZO6">
-                                              <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
-                                            </node>
-                                          </node>
-                                          <node concept="a7P8L" id="3R6X$QWo$FM" role="3AunhB">
-                                            <ref role="a7OzE" node="6EY0p2wFDt6" resolve="MethTVs" />
-                                            <node concept="37vLTw" id="3R6X$QWo$P2" role="3gCZO6">
-                                              <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
-                                            </node>
-                                          </node>
+                                  <node concept="3cpWs8" id="3R6X$QWJeU7" role="3cqZAp">
+                                    <node concept="3cpWsn" id="3R6X$QWJeUa" role="3cpWs9">
+                                      <property role="TrG5h" value="errNodePtr" />
+                                      <node concept="2sp9CU" id="3R6X$QWJeU5" role="1tU5fm" />
+                                      <node concept="2OqwBi" id="3R6X$QWJgsY" role="33vP2m">
+                                        <node concept="37vLTw" id="3R6X$QWJgiv" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="5Oz70LKieUV" resolve="tyArg" />
+                                        </node>
+                                        <node concept="iZEcu" id="3R6X$QWJgAz" role="2OqNvi" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3Aqczg" id="3R6X$QWoei1" role="3cqZAp">
+                                    <node concept="3Aqt3T" id="3R6X$QWoehZ" role="3Aqpz8">
+                                      <ref role="3AqCNq" node="3R6X$QWo8$D" resolve="captureVar" />
+                                      <node concept="a7P8L" id="3R6X$QWohfr" role="3AunhB">
+                                        <ref role="a7OzE" node="3R6X$QWoi1O" resolve="CapTyArgs" />
+                                        <node concept="37vLTw" id="3R6X$QWohjB" role="3gCZO6">
+                                          <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
                                         </node>
                                       </node>
-                                      <node concept="3SKdUt" id="5Oz70LKgLUn" role="3cqZAp">
-                                        <node concept="1PaTwC" id="5Oz70LKgLUo" role="3ndbpf">
-                                          <node concept="3oM_SD" id="5Oz70LKgLUp" role="1PaTwD">
-                                            <property role="3oM_SC" value="check" />
-                                          </node>
-                                          <node concept="3oM_SD" id="5Oz70LKgLUq" role="1PaTwD">
-                                            <property role="3oM_SC" value="compatibility" />
-                                          </node>
-                                          <node concept="3oM_SD" id="5Oz70LKgLUr" role="1PaTwD">
-                                            <property role="3oM_SC" value="with" />
-                                          </node>
-                                          <node concept="3oM_SD" id="5Oz70LKgLUs" role="1PaTwD">
-                                            <property role="3oM_SC" value="declared" />
-                                          </node>
-                                          <node concept="3oM_SD" id="5Oz70LKgLUt" role="1PaTwD">
-                                            <property role="3oM_SC" value="bounds" />
-                                          </node>
+                                      <node concept="a7P8L" id="3R6X$QWo$rC" role="3AunhB">
+                                        <ref role="a7OzE" node="6EY0p2wFugP" resolve="TyArg" />
+                                        <node concept="37vLTw" id="3R6X$QWo$vE" role="3gCZO6">
+                                          <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
                                         </node>
                                       </node>
-                                      <node concept="3Aqczg" id="5Oz70LKgJDs" role="3cqZAp">
-                                        <node concept="3Aqt3T" id="5Oz70LKgJDq" role="3Aqpz8">
-                                          <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                                          <node concept="a7P8L" id="5Oz70LKgJLx" role="3AunhB">
-                                            <ref role="a7OzE" node="3R6X$QWoi1O" resolve="CapTyArgs" />
-                                            <node concept="37vLTw" id="5Oz70LKiCaE" role="3gCZO6">
-                                              <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
-                                            </node>
-                                          </node>
-                                          <node concept="a7P8L" id="5Oz70LKgL3J" role="3AunhB">
-                                            <ref role="a7OzE" node="5Oz70LKf$8x" resolve="MethTVBounds" />
-                                            <node concept="37vLTw" id="5Oz70LKiCfj" role="3gCZO6">
-                                              <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3SKdUt" id="5Oz70LKgM6y" role="3cqZAp">
-                                        <node concept="1PaTwC" id="5Oz70LKgM6z" role="3ndbpf">
-                                          <node concept="3oM_SD" id="5Oz70LKgM6$" role="1PaTwD">
-                                            <property role="3oM_SC" value="bind" />
-                                          </node>
-                                          <node concept="3oM_SD" id="5Oz70LKgM6_" role="1PaTwD">
-                                            <property role="3oM_SC" value="instantiated" />
-                                          </node>
-                                          <node concept="3oM_SD" id="5Oz70LKgM6A" role="1PaTwD">
-                                            <property role="3oM_SC" value="var" />
-                                          </node>
-                                          <node concept="3oM_SD" id="5Oz70LKgM6B" role="1PaTwD">
-                                            <property role="3oM_SC" value="after" />
-                                          </node>
-                                          <node concept="3oM_SD" id="5Oz70LKgM6C" role="1PaTwD">
-                                            <property role="3oM_SC" value="successful" />
-                                          </node>
-                                          <node concept="3oM_SD" id="5Oz70LKgM6D" role="1PaTwD">
-                                            <property role="3oM_SC" value="check" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3Aqczg" id="5Oz70LKgRye" role="3cqZAp">
-                                        <node concept="3A8Hvi" id="5Oz70LKgRy8" role="3Aqpz8">
-                                          <node concept="a7P8L" id="5Oz70LKgREi" role="3A8wtg">
-                                            <ref role="a7OzE" node="6EY0p2wFDt6" resolve="MethTVs" />
-                                            <node concept="37vLTw" id="5Oz70LKiCpJ" role="3gCZO6">
-                                              <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
-                                            </node>
-                                          </node>
-                                          <node concept="a7P8L" id="5Oz70LKiCzB" role="3A8w4Q">
-                                            <ref role="a7OzE" node="3R6X$QWoi1O" resolve="CapTyArgs" />
-                                            <node concept="37vLTw" id="5Oz70LKiCC8" role="3gCZO6">
-                                              <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
-                                            </node>
-                                          </node>
+                                      <node concept="a7P8L" id="3R6X$QWo$FM" role="3AunhB">
+                                        <ref role="a7OzE" node="6EY0p2wFDt6" resolve="MethTVs" />
+                                        <node concept="37vLTw" id="3R6X$QWo$P2" role="3gCZO6">
+                                          <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="37vLTw" id="5Oz70LKiBTr" role="3Hbm9W">
-                                      <ref role="3cqZAo" node="5Oz70LKieUV" resolve="tyArg" />
+                                  </node>
+                                  <node concept="3SKdUt" id="5Oz70LKgLUn" role="3cqZAp">
+                                    <node concept="1PaTwC" id="5Oz70LKgLUo" role="3ndbpf">
+                                      <node concept="3oM_SD" id="5Oz70LKgLUp" role="1PaTwD">
+                                        <property role="3oM_SC" value="check" />
+                                      </node>
+                                      <node concept="3oM_SD" id="5Oz70LKgLUq" role="1PaTwD">
+                                        <property role="3oM_SC" value="compatibility" />
+                                      </node>
+                                      <node concept="3oM_SD" id="5Oz70LKgLUr" role="1PaTwD">
+                                        <property role="3oM_SC" value="with" />
+                                      </node>
+                                      <node concept="3oM_SD" id="5Oz70LKgLUs" role="1PaTwD">
+                                        <property role="3oM_SC" value="declared" />
+                                      </node>
+                                      <node concept="3oM_SD" id="5Oz70LKgLUt" role="1PaTwD">
+                                        <property role="3oM_SC" value="bounds" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3Aqczg" id="3R6X$QWDwLu" role="3cqZAp">
+                                    <node concept="3Aqt3T" id="3R6X$QWDwLv" role="3Aqpz8">
+                                      <ref role="3AqCNq" node="3MG3BxoG13Q" resolve="convertsToSafe" />
+                                      <node concept="a7P8L" id="3R6X$QWDwLw" role="3AunhB">
+                                        <ref role="a7OzE" node="3R6X$QWoi1O" resolve="CapTyArgs" />
+                                        <node concept="37vLTw" id="3R6X$QWDwLx" role="3gCZO6">
+                                          <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
+                                        </node>
+                                      </node>
+                                      <node concept="a7P8L" id="3R6X$QWDwLy" role="3AunhB">
+                                        <ref role="a7OzE" node="5Oz70LKf$8x" resolve="MethTVBounds" />
+                                        <node concept="37vLTw" id="3R6X$QWDwLz" role="3gCZO6">
+                                          <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
+                                        </node>
+                                      </node>
+                                      <node concept="HKQnh" id="3R6X$QWDxVB" role="3AunhB">
+                                        <node concept="37vLTw" id="3R6X$QWJin4" role="HKQng">
+                                          <ref role="3cqZAo" node="3R6X$QWJeUa" resolve="errNodePtr" />
+                                        </node>
+                                      </node>
+                                      <node concept="HKQnh" id="3R6X$QWDy7s" role="3AunhB">
+                                        <node concept="Xl_RD" id="3R6X$QWDDZS" role="HKQng">
+                                          <property role="Xl_RC" value="wrong substitute" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3SKdUt" id="5Oz70LKgM6y" role="3cqZAp">
+                                    <node concept="1PaTwC" id="5Oz70LKgM6z" role="3ndbpf">
+                                      <node concept="3oM_SD" id="5Oz70LKgM6$" role="1PaTwD">
+                                        <property role="3oM_SC" value="bind" />
+                                      </node>
+                                      <node concept="3oM_SD" id="5Oz70LKgM6_" role="1PaTwD">
+                                        <property role="3oM_SC" value="instantiated" />
+                                      </node>
+                                      <node concept="3oM_SD" id="5Oz70LKgM6A" role="1PaTwD">
+                                        <property role="3oM_SC" value="var" />
+                                      </node>
+                                      <node concept="3oM_SD" id="5Oz70LKgM6B" role="1PaTwD">
+                                        <property role="3oM_SC" value="after" />
+                                      </node>
+                                      <node concept="3oM_SD" id="5Oz70LKgM6C" role="1PaTwD">
+                                        <property role="3oM_SC" value="successful" />
+                                      </node>
+                                      <node concept="3oM_SD" id="5Oz70LKgM6D" role="1PaTwD">
+                                        <property role="3oM_SC" value="check" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3Aqczg" id="5Oz70LKgRye" role="3cqZAp">
+                                    <node concept="3A8Hvi" id="5Oz70LKgRy8" role="3Aqpz8">
+                                      <node concept="a7P8L" id="5Oz70LKgREi" role="3A8wtg">
+                                        <ref role="a7OzE" node="6EY0p2wFDt6" resolve="MethTVs" />
+                                        <node concept="37vLTw" id="5Oz70LKiCpJ" role="3gCZO6">
+                                          <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
+                                        </node>
+                                      </node>
+                                      <node concept="a7P8L" id="5Oz70LKiCzB" role="3A8w4Q">
+                                        <ref role="a7OzE" node="3R6X$QWoi1O" resolve="CapTyArgs" />
+                                        <node concept="37vLTw" id="5Oz70LKiCC8" role="3gCZO6">
+                                          <ref role="3cqZAo" node="5Oz70LKgSuY" resolve="i" />
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -7719,108 +7734,123 @@
                                       </node>
                                     </node>
                                   </node>
-                                  <node concept="3Hbl2A" id="3R6X$QWrj_z" role="3cqZAp">
-                                    <node concept="3clFbS" id="3R6X$QWrj_$" role="9aQI4">
-                                      <node concept="3Aqczg" id="3R6X$QWrj__" role="3cqZAp">
-                                        <node concept="3Aqt3T" id="3R6X$QWrj_A" role="3Aqpz8">
-                                          <ref role="3AqCNq" node="3R6X$QWo8$D" resolve="captureVar" />
-                                          <node concept="a7P8L" id="3R6X$QWrj_B" role="3AunhB">
-                                            <ref role="a7OzE" node="3R6X$QWrjCF" resolve="CapTyArgs" />
-                                            <node concept="37vLTw" id="3R6X$QWrj_C" role="3gCZO6">
-                                              <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
-                                            </node>
-                                          </node>
-                                          <node concept="a7P8L" id="3R6X$QWrj_D" role="3AunhB">
-                                            <ref role="a7OzE" node="3R6X$QWrjCL" resolve="TyArg" />
-                                            <node concept="37vLTw" id="3R6X$QWrj_E" role="3gCZO6">
-                                              <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
-                                            </node>
-                                          </node>
-                                          <node concept="a7P8L" id="3R6X$QWrj_F" role="3AunhB">
-                                            <ref role="a7OzE" node="3R6X$QWrjCR" resolve="MethTVs" />
-                                            <node concept="37vLTw" id="3R6X$QWrj_G" role="3gCZO6">
-                                              <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
-                                            </node>
-                                          </node>
+                                  <node concept="3cpWs8" id="3R6X$QWJlsG" role="3cqZAp">
+                                    <node concept="3cpWsn" id="3R6X$QWJlsH" role="3cpWs9">
+                                      <property role="TrG5h" value="errNodePtr" />
+                                      <node concept="2sp9CU" id="3R6X$QWJlsI" role="1tU5fm" />
+                                      <node concept="2OqwBi" id="3R6X$QWJlsJ" role="33vP2m">
+                                        <node concept="37vLTw" id="3R6X$QWJlsK" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="3R6X$QWrj_j" resolve="tyArg" />
+                                        </node>
+                                        <node concept="iZEcu" id="3R6X$QWJlsL" role="2OqNvi" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3Aqczg" id="3R6X$QWJlsM" role="3cqZAp">
+                                    <node concept="3Aqt3T" id="3R6X$QWJlsN" role="3Aqpz8">
+                                      <ref role="3AqCNq" node="3R6X$QWo8$D" resolve="captureVar" />
+                                      <node concept="a7P8L" id="3R6X$QWJlsO" role="3AunhB">
+                                        <ref role="a7OzE" node="3R6X$QWrjCF" resolve="CapTyArgs" />
+                                        <node concept="37vLTw" id="3R6X$QWJlsP" role="3gCZO6">
+                                          <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
                                         </node>
                                       </node>
-                                      <node concept="3SKdUt" id="3R6X$QWrj_H" role="3cqZAp">
-                                        <node concept="1PaTwC" id="3R6X$QWrj_I" role="3ndbpf">
-                                          <node concept="3oM_SD" id="3R6X$QWrj_J" role="1PaTwD">
-                                            <property role="3oM_SC" value="check" />
-                                          </node>
-                                          <node concept="3oM_SD" id="3R6X$QWrj_K" role="1PaTwD">
-                                            <property role="3oM_SC" value="compatibility" />
-                                          </node>
-                                          <node concept="3oM_SD" id="3R6X$QWrj_L" role="1PaTwD">
-                                            <property role="3oM_SC" value="with" />
-                                          </node>
-                                          <node concept="3oM_SD" id="3R6X$QWrj_M" role="1PaTwD">
-                                            <property role="3oM_SC" value="declared" />
-                                          </node>
-                                          <node concept="3oM_SD" id="3R6X$QWrj_N" role="1PaTwD">
-                                            <property role="3oM_SC" value="bounds" />
-                                          </node>
+                                      <node concept="a7P8L" id="3R6X$QWJlsQ" role="3AunhB">
+                                        <ref role="a7OzE" node="3R6X$QWrjCL" resolve="TyArg" />
+                                        <node concept="37vLTw" id="3R6X$QWJlsR" role="3gCZO6">
+                                          <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
                                         </node>
                                       </node>
-                                      <node concept="3Aqczg" id="3R6X$QWrj_O" role="3cqZAp">
-                                        <node concept="3Aqt3T" id="3R6X$QWrj_P" role="3Aqpz8">
-                                          <ref role="3AqCNq" node="3Qp4N06bUPu" resolve="convertsTo" />
-                                          <node concept="a7P8L" id="3R6X$QWrj_Q" role="3AunhB">
-                                            <ref role="a7OzE" node="3R6X$QWrjCF" resolve="CapTyArgs" />
-                                            <node concept="37vLTw" id="3R6X$QWrj_R" role="3gCZO6">
-                                              <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
-                                            </node>
-                                          </node>
-                                          <node concept="a7P8L" id="3R6X$QWrj_S" role="3AunhB">
-                                            <ref role="a7OzE" node="3R6X$QWrjCV" resolve="MethTVBounds" />
-                                            <node concept="37vLTw" id="3R6X$QWrj_T" role="3gCZO6">
-                                              <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3SKdUt" id="3R6X$QWrj_U" role="3cqZAp">
-                                        <node concept="1PaTwC" id="3R6X$QWrj_V" role="3ndbpf">
-                                          <node concept="3oM_SD" id="3R6X$QWrj_W" role="1PaTwD">
-                                            <property role="3oM_SC" value="bind" />
-                                          </node>
-                                          <node concept="3oM_SD" id="3R6X$QWrj_X" role="1PaTwD">
-                                            <property role="3oM_SC" value="instantiated" />
-                                          </node>
-                                          <node concept="3oM_SD" id="3R6X$QWrj_Y" role="1PaTwD">
-                                            <property role="3oM_SC" value="var" />
-                                          </node>
-                                          <node concept="3oM_SD" id="3R6X$QWrj_Z" role="1PaTwD">
-                                            <property role="3oM_SC" value="after" />
-                                          </node>
-                                          <node concept="3oM_SD" id="3R6X$QWrjA0" role="1PaTwD">
-                                            <property role="3oM_SC" value="successful" />
-                                          </node>
-                                          <node concept="3oM_SD" id="3R6X$QWrjA1" role="1PaTwD">
-                                            <property role="3oM_SC" value="check" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="3Aqczg" id="3R6X$QWrjA2" role="3cqZAp">
-                                        <node concept="3A8Hvi" id="3R6X$QWrjA3" role="3Aqpz8">
-                                          <node concept="a7P8L" id="3R6X$QWrjA4" role="3A8wtg">
-                                            <ref role="a7OzE" node="3R6X$QWrjCR" resolve="MethTVs" />
-                                            <node concept="37vLTw" id="3R6X$QWrjA5" role="3gCZO6">
-                                              <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
-                                            </node>
-                                          </node>
-                                          <node concept="a7P8L" id="3R6X$QWrjA6" role="3A8w4Q">
-                                            <ref role="a7OzE" node="3R6X$QWrjCF" resolve="CapTyArgs" />
-                                            <node concept="37vLTw" id="3R6X$QWrjA7" role="3gCZO6">
-                                              <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
-                                            </node>
-                                          </node>
+                                      <node concept="a7P8L" id="3R6X$QWJlsS" role="3AunhB">
+                                        <ref role="a7OzE" node="3R6X$QWrjCR" resolve="MethTVs" />
+                                        <node concept="37vLTw" id="3R6X$QWJlsT" role="3gCZO6">
+                                          <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
                                         </node>
                                       </node>
                                     </node>
-                                    <node concept="37vLTw" id="3R6X$QWrjA8" role="3Hbm9W">
-                                      <ref role="3cqZAo" node="3R6X$QWrj_j" resolve="tyArg" />
+                                  </node>
+                                  <node concept="3SKdUt" id="3R6X$QWJlsU" role="3cqZAp">
+                                    <node concept="1PaTwC" id="3R6X$QWJlsV" role="3ndbpf">
+                                      <node concept="3oM_SD" id="3R6X$QWJlsW" role="1PaTwD">
+                                        <property role="3oM_SC" value="check" />
+                                      </node>
+                                      <node concept="3oM_SD" id="3R6X$QWJlsX" role="1PaTwD">
+                                        <property role="3oM_SC" value="compatibility" />
+                                      </node>
+                                      <node concept="3oM_SD" id="3R6X$QWJlsY" role="1PaTwD">
+                                        <property role="3oM_SC" value="with" />
+                                      </node>
+                                      <node concept="3oM_SD" id="3R6X$QWJlsZ" role="1PaTwD">
+                                        <property role="3oM_SC" value="declared" />
+                                      </node>
+                                      <node concept="3oM_SD" id="3R6X$QWJlt0" role="1PaTwD">
+                                        <property role="3oM_SC" value="bounds" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3Aqczg" id="3R6X$QWJlt1" role="3cqZAp">
+                                    <node concept="3Aqt3T" id="3R6X$QWJlt2" role="3Aqpz8">
+                                      <ref role="3AqCNq" node="3MG3BxoG13Q" resolve="convertsToSafe" />
+                                      <node concept="a7P8L" id="3R6X$QWJlt3" role="3AunhB">
+                                        <ref role="a7OzE" node="3R6X$QWrjCF" resolve="CapTyArgs" />
+                                        <node concept="37vLTw" id="3R6X$QWJlt4" role="3gCZO6">
+                                          <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
+                                        </node>
+                                      </node>
+                                      <node concept="a7P8L" id="3R6X$QWJlt5" role="3AunhB">
+                                        <ref role="a7OzE" node="3R6X$QWrjCV" resolve="MethTVBounds" />
+                                        <node concept="37vLTw" id="3R6X$QWJlt6" role="3gCZO6">
+                                          <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
+                                        </node>
+                                      </node>
+                                      <node concept="HKQnh" id="3R6X$QWJlt7" role="3AunhB">
+                                        <node concept="37vLTw" id="3R6X$QWJlt8" role="HKQng">
+                                          <ref role="3cqZAo" node="3R6X$QWJlsH" resolve="errNodePtr" />
+                                        </node>
+                                      </node>
+                                      <node concept="HKQnh" id="3R6X$QWJlt9" role="3AunhB">
+                                        <node concept="Xl_RD" id="3R6X$QWJlta" role="HKQng">
+                                          <property role="Xl_RC" value="wrong substitute" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3SKdUt" id="3R6X$QWJltb" role="3cqZAp">
+                                    <node concept="1PaTwC" id="3R6X$QWJltc" role="3ndbpf">
+                                      <node concept="3oM_SD" id="3R6X$QWJltd" role="1PaTwD">
+                                        <property role="3oM_SC" value="bind" />
+                                      </node>
+                                      <node concept="3oM_SD" id="3R6X$QWJlte" role="1PaTwD">
+                                        <property role="3oM_SC" value="instantiated" />
+                                      </node>
+                                      <node concept="3oM_SD" id="3R6X$QWJltf" role="1PaTwD">
+                                        <property role="3oM_SC" value="var" />
+                                      </node>
+                                      <node concept="3oM_SD" id="3R6X$QWJltg" role="1PaTwD">
+                                        <property role="3oM_SC" value="after" />
+                                      </node>
+                                      <node concept="3oM_SD" id="3R6X$QWJlth" role="1PaTwD">
+                                        <property role="3oM_SC" value="successful" />
+                                      </node>
+                                      <node concept="3oM_SD" id="3R6X$QWJlti" role="1PaTwD">
+                                        <property role="3oM_SC" value="check" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3Aqczg" id="3R6X$QWJltj" role="3cqZAp">
+                                    <node concept="3A8Hvi" id="3R6X$QWJltk" role="3Aqpz8">
+                                      <node concept="a7P8L" id="3R6X$QWJltl" role="3A8wtg">
+                                        <ref role="a7OzE" node="3R6X$QWrjCR" resolve="MethTVs" />
+                                        <node concept="37vLTw" id="3R6X$QWJltm" role="3gCZO6">
+                                          <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
+                                        </node>
+                                      </node>
+                                      <node concept="a7P8L" id="3R6X$QWJltn" role="3A8w4Q">
+                                        <ref role="a7OzE" node="3R6X$QWrjCF" resolve="CapTyArgs" />
+                                        <node concept="37vLTw" id="3R6X$QWJlto" role="3gCZO6">
+                                          <ref role="3cqZAo" node="3R6X$QWrjA9" resolve="i" />
+                                        </node>
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
@@ -16967,29 +16997,29 @@
             </node>
             <node concept="3Aq9E8" id="2shrukTPBe$" role="1nLNMd">
               <node concept="3I6sU6" id="4nIWweBB_8G" role="3Ip0Jz">
-                <node concept="3I6s7M" id="4WwvXRZ8gyo" role="3I6sU7">
-                  <node concept="1lpGmL" id="4WwvXRZ8gyk" role="3I6s78">
-                    <node concept="3cpWs3" id="4WwvXRZ8igB" role="1lp$hM">
-                      <node concept="3cpWs3" id="4WwvXRZ8h9$" role="3uHU7B">
-                        <node concept="3cpWs3" id="4WwvXRZ8h50" role="3uHU7B">
-                          <node concept="Xl_RD" id="4WwvXRZ8gyv" role="3uHU7B">
+                <node concept="3I6s7M" id="3R6X$QWJnIG" role="3I6sU7">
+                  <node concept="1lpGmL" id="3R6X$QWFiQ3" role="3I6s78">
+                    <node concept="3cpWs3" id="3R6X$QWFiGs" role="1lp$hM">
+                      <node concept="3cpWs3" id="3R6X$QWFiGt" role="3uHU7B">
+                        <node concept="3cpWs3" id="3R6X$QWFiGu" role="3uHU7B">
+                          <node concept="Xl_RD" id="3R6X$QWFiGv" role="3uHU7B">
                             <property role="Xl_RC" value="type " />
                           </node>
-                          <node concept="1TmgYN" id="4WwvXRZbqIE" role="3uHU7w">
-                            <node concept="1nq8_$" id="4WwvXRZbqJj" role="1Tms7$">
-                              <node concept="a7P8L" id="4WwvXRZbqJh" role="1nq8_t">
+                          <node concept="1TmgYN" id="3R6X$QWFiGw" role="3uHU7w">
+                            <node concept="1nq8_$" id="3R6X$QWFiGx" role="1Tms7$">
+                              <node concept="a7P8L" id="3R6X$QWFiGy" role="1nq8_t">
                                 <ref role="a7OzE" node="2CsZ2XTdf5" resolve="S" />
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="Xl_RD" id="4WwvXRZ8h5c" role="3uHU7w">
+                        <node concept="Xl_RD" id="3R6X$QWFiGz" role="3uHU7w">
                           <property role="Xl_RC" value=" cannot be converted to " />
                         </node>
                       </node>
-                      <node concept="1TmgYN" id="4WwvXRZbqT9" role="3uHU7w">
-                        <node concept="1nq8_$" id="4WwvXRZbqYy" role="1Tms7$">
-                          <node concept="a7P8L" id="4WwvXRZbqYw" role="1nq8_t">
+                      <node concept="1TmgYN" id="3R6X$QWFiG$" role="3uHU7w">
+                        <node concept="1nq8_$" id="3R6X$QWFiG_" role="1Tms7$">
+                          <node concept="a7P8L" id="3R6X$QWFiGA" role="1nq8_t">
                             <ref role="a7OzE" node="2CsZ2XTdfe" resolve="T" />
                           </node>
                         </node>
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 3c8ff7d0..373399cc 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
@@ -1672,162 +1672,154 @@
     <node concept="312cEu" id="2PEDwPSdka8" role="jymVt">
       <property role="TrG5h" value="Demo" />
       <node concept="2tJIrI" id="2VOKs1ArBqB" role="jymVt" />
-      <node concept="1X3_iC" id="4ObboSeqkW_" role="lGtFl">
-        <property role="3V$3am" value="member" />
-        <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107461130800/5375687026011219971" />
-        <node concept="3clFb_" id="2PEDwPS8x7_" role="8Wnug">
-          <property role="TrG5h" value="badCase" />
-          <node concept="37vLTG" id="2PEDwPS8xdk" role="3clF46">
-            <property role="TrG5h" value="elem" />
-            <node concept="16syzq" id="2PEDwPS8xeF" role="1tU5fm">
-              <ref role="16sUi3" node="2PEDwPS8xbC" resolve="T" />
+      <node concept="3clFb_" id="2PEDwPS8x7_" role="jymVt">
+        <property role="TrG5h" value="badCase" />
+        <node concept="37vLTG" id="2PEDwPS8xdk" role="3clF46">
+          <property role="TrG5h" value="elem" />
+          <node concept="16syzq" id="2PEDwPS8xeF" role="1tU5fm">
+            <ref role="16sUi3" node="2PEDwPS8xbC" resolve="T" />
+          </node>
+        </node>
+        <node concept="37vLTG" id="2PEDwPS8xge" role="3clF46">
+          <property role="TrG5h" value="ls" />
+          <node concept="3uibUv" id="2PEDwPS8xC2" role="1tU5fm">
+            <ref role="3uigEE" node="2PEDwPSdg4X" resolve="Containment.ForErrors2" />
+            <node concept="3uibUv" id="2PEDwPS8xGm" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Double" resolve="Double" />
             </node>
           </node>
-          <node concept="37vLTG" id="2PEDwPS8xge" role="3clF46">
-            <property role="TrG5h" value="ls" />
-            <node concept="3uibUv" id="2PEDwPS8xC2" role="1tU5fm">
-              <ref role="3uigEE" node="2PEDwPSdg4X" resolve="Containment.ForErrors2" />
-              <node concept="3uibUv" id="2PEDwPS8xGm" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~Double" resolve="Double" />
+        </node>
+        <node concept="3clFbS" id="2PEDwPS8x7C" role="3clF47">
+          <node concept="3cpWs8" id="2PEDwPS8xJ5" role="3cqZAp">
+            <node concept="3cpWsn" id="2PEDwPS8xJ6" role="3cpWs9">
+              <property role="TrG5h" value="lsBad" />
+              <node concept="3uibUv" id="2PEDwPS8xO9" role="1tU5fm">
+                <ref role="3uigEE" node="2PEDwPSdg4X" resolve="Containment.ForErrors2" />
+                <node concept="16syzq" id="2PEDwPS8xYu" role="11_B2D">
+                  <ref role="16sUi3" node="2PEDwPS8xbC" resolve="T" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="2PEDwPS8y2m" role="33vP2m">
+                <ref role="3cqZAo" node="2PEDwPS8xge" resolve="ls" />
+              </node>
+              <node concept="1U20sH" id="3mytCjZkuQY" role="lGtFl">
+                <property role="1U20sK" value="error" />
               </node>
             </node>
           </node>
-          <node concept="3clFbS" id="2PEDwPS8x7C" role="3clF47">
-            <node concept="3cpWs8" id="2PEDwPS8xJ5" role="3cqZAp">
-              <node concept="3cpWsn" id="2PEDwPS8xJ6" role="3cpWs9">
-                <property role="TrG5h" value="lsBad" />
-                <node concept="3uibUv" id="2PEDwPS8xO9" role="1tU5fm">
-                  <ref role="3uigEE" node="2PEDwPSdg4X" resolve="Containment.ForErrors2" />
-                  <node concept="16syzq" id="2PEDwPS8xYu" role="11_B2D">
-                    <ref role="16sUi3" node="2PEDwPS8xbC" resolve="T" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="2PEDwPS8y2m" role="33vP2m">
-                  <ref role="3cqZAo" node="2PEDwPS8xge" resolve="ls" />
-                </node>
-                <node concept="1U20sH" id="3mytCjZkuQY" role="lGtFl">
-                  <property role="1U20sK" value="error" />
-                </node>
+          <node concept="3clFbF" id="2PEDwPS8yao" role="3cqZAp">
+            <node concept="2OqwBi" id="2PEDwPS8yfd" role="3clFbG">
+              <node concept="37vLTw" id="2PEDwPS8yam" role="2Oq$k0">
+                <ref role="3cqZAo" node="2PEDwPS8xJ6" resolve="lsBad" />
               </node>
-            </node>
-            <node concept="3clFbF" id="2PEDwPS8yao" role="3cqZAp">
-              <node concept="2OqwBi" id="2PEDwPS8yfd" role="3clFbG">
-                <node concept="37vLTw" id="2PEDwPS8yam" role="2Oq$k0">
-                  <ref role="3cqZAo" node="2PEDwPS8xJ6" resolve="lsBad" />
-                </node>
-                <node concept="liA8E" id="2PEDwPS8yiQ" role="2OqNvi">
-                  <ref role="37wK5l" node="2PEDwPSdk9O" resolve="add" />
-                  <node concept="37vLTw" id="2PEDwPS8y_D" role="37wK5m">
-                    <ref role="3cqZAo" node="2PEDwPS8xdk" resolve="elem" />
-                  </node>
+              <node concept="liA8E" id="2PEDwPS8yiQ" role="2OqNvi">
+                <ref role="37wK5l" node="2PEDwPSdk9O" resolve="add" />
+                <node concept="37vLTw" id="2PEDwPS8y_D" role="37wK5m">
+                  <ref role="3cqZAo" node="2PEDwPS8xdk" resolve="elem" />
                 </node>
               </node>
             </node>
           </node>
-          <node concept="3Tm1VV" id="2PEDwPS8x51" role="1B3o_S" />
-          <node concept="3cqZAl" id="2PEDwPS8xax" role="3clF45" />
-          <node concept="16euLQ" id="2PEDwPS8xbC" role="16eVyc">
-            <property role="TrG5h" value="T" />
-            <node concept="3uibUv" id="2PEDwPS8ERk" role="3ztrMU">
-              <ref role="3uigEE" to="wyt6:~Number" resolve="Number" />
-            </node>
+        </node>
+        <node concept="3Tm1VV" id="2PEDwPS8x51" role="1B3o_S" />
+        <node concept="3cqZAl" id="2PEDwPS8xax" role="3clF45" />
+        <node concept="16euLQ" id="2PEDwPS8xbC" role="16eVyc">
+          <property role="TrG5h" value="T" />
+          <node concept="3uibUv" id="2PEDwPS8ERk" role="3ztrMU">
+            <ref role="3uigEE" to="wyt6:~Number" resolve="Number" />
           </node>
         </node>
       </node>
       <node concept="2tJIrI" id="1RiyfbgUCae" role="jymVt" />
-      <node concept="1X3_iC" id="4ObboSeqkyU" role="lGtFl">
-        <property role="3V$3am" value="member" />
-        <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1107461130800/5375687026011219971" />
-        <node concept="3clFb_" id="PltxfHwdmx" role="8Wnug">
-          <property role="TrG5h" value="anotherExample" />
-          <node concept="37vLTG" id="PltxfHwdmA" role="3clF46">
-            <property role="TrG5h" value="e" />
-            <node concept="3uibUv" id="PltxfHwdmB" role="1tU5fm">
-              <ref role="3uigEE" node="2PEDwPSdka2" resolve="Containment.E" />
-              <node concept="3uibUv" id="PltxfHwdmC" role="11_B2D">
+      <node concept="3clFb_" id="PltxfHwdmx" role="jymVt">
+        <property role="TrG5h" value="anotherExample" />
+        <node concept="37vLTG" id="PltxfHwdmA" role="3clF46">
+          <property role="TrG5h" value="e" />
+          <node concept="3uibUv" id="PltxfHwdmB" role="1tU5fm">
+            <ref role="3uigEE" node="2PEDwPSdka2" resolve="Containment.E" />
+            <node concept="3uibUv" id="PltxfHwdmC" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Double" resolve="Double" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbS" id="PltxfHwdmD" role="3clF47">
+          <node concept="3clFbH" id="2PEDwPS8vba" role="3cqZAp" />
+          <node concept="3cpWs8" id="2PEDwPS8u6H" role="3cqZAp">
+            <node concept="3cpWsn" id="2PEDwPS8u6I" role="3cpWs9">
+              <property role="TrG5h" value="f" />
+              <node concept="3uibUv" id="2PEDwPS8u6J" role="1tU5fm">
                 <ref role="3uigEE" to="wyt6:~Double" resolve="Double" />
               </node>
+              <node concept="3b6qkQ" id="2PEDwPS8ufL" role="33vP2m">
+                <property role="$nhwW" value="1.23" />
+              </node>
             </node>
           </node>
-          <node concept="3clFbS" id="PltxfHwdmD" role="3clF47">
-            <node concept="3clFbH" id="2PEDwPS8vba" role="3cqZAp" />
-            <node concept="3cpWs8" id="2PEDwPS8u6H" role="3cqZAp">
-              <node concept="3cpWsn" id="2PEDwPS8u6I" role="3cpWs9">
-                <property role="TrG5h" value="f" />
-                <node concept="3uibUv" id="2PEDwPS8u6J" role="1tU5fm">
-                  <ref role="3uigEE" to="wyt6:~Double" resolve="Double" />
-                </node>
-                <node concept="3b6qkQ" id="2PEDwPS8ufL" role="33vP2m">
-                  <property role="$nhwW" value="1.23" />
-                </node>
+          <node concept="3cpWs8" id="2PEDwPS8ut5" role="3cqZAp">
+            <node concept="3cpWsn" id="2PEDwPS8ut8" role="3cpWs9">
+              <property role="TrG5h" value="basicError" />
+              <node concept="16syzq" id="2PEDwPS8utV" role="1tU5fm">
+                <ref role="16sUi3" node="2PEDwPS8uhk" resolve="SD" />
+              </node>
+              <node concept="37vLTw" id="2PEDwPS8uvt" role="33vP2m">
+                <ref role="3cqZAo" node="2PEDwPS8u6I" resolve="f" />
+              </node>
+              <node concept="1U20sH" id="2PEDwPSdeBx" role="lGtFl">
+                <property role="1U20sK" value="error" />
               </node>
             </node>
-            <node concept="3cpWs8" id="2PEDwPS8ut5" role="3cqZAp">
-              <node concept="3cpWsn" id="2PEDwPS8ut8" role="3cpWs9">
-                <property role="TrG5h" value="basicError" />
-                <node concept="16syzq" id="2PEDwPS8utV" role="1tU5fm">
-                  <ref role="16sUi3" node="2PEDwPS8uhk" resolve="SD" />
-                </node>
-                <node concept="37vLTw" id="2PEDwPS8uvt" role="33vP2m">
-                  <ref role="3cqZAo" node="2PEDwPS8u6I" resolve="f" />
-                </node>
-                <node concept="1U20sH" id="2PEDwPSdeBx" role="lGtFl">
-                  <property role="1U20sK" value="error" />
+          </node>
+          <node concept="3clFbH" id="2PEDwPS8u$7" role="3cqZAp" />
+          <node concept="3cpWs8" id="2PEDwPS7RDf" role="3cqZAp">
+            <node concept="3cpWsn" id="2PEDwPS7RDg" role="3cpWs9">
+              <property role="TrG5h" value="resErr1" />
+              <node concept="3uibUv" id="2PEDwPS7RDn" role="1tU5fm">
+                <ref role="3uigEE" node="2PEDwPSdk9W" resolve="Containment.ForErrors1" />
+                <node concept="16syzq" id="2PEDwPS7S6T" role="11_B2D">
+                  <ref role="16sUi3" node="PltxfHwdmQ" resolve="S" />
                 </node>
               </node>
+              <node concept="37vLTw" id="2PEDwPS8dMR" role="33vP2m">
+                <ref role="3cqZAo" node="PltxfHwdmA" resolve="e" />
+              </node>
+              <node concept="1U20sH" id="3mytCjZkw$A" role="lGtFl">
+                <property role="1U20sK" value="error" />
+              </node>
             </node>
-            <node concept="3clFbH" id="2PEDwPS8u$7" role="3cqZAp" />
-            <node concept="3cpWs8" id="2PEDwPS7RDf" role="3cqZAp">
-              <node concept="3cpWsn" id="2PEDwPS7RDg" role="3cpWs9">
-                <property role="TrG5h" value="resErr1" />
-                <node concept="3uibUv" id="2PEDwPS7RDn" role="1tU5fm">
-                  <ref role="3uigEE" node="2PEDwPSdk9W" resolve="Containment.ForErrors1" />
-                  <node concept="16syzq" id="2PEDwPS7S6T" role="11_B2D">
-                    <ref role="16sUi3" node="PltxfHwdmQ" resolve="S" />
+          </node>
+          <node concept="3cpWs8" id="2PEDwPS8g60" role="3cqZAp">
+            <node concept="3cpWsn" id="2PEDwPS8g61" role="3cpWs9">
+              <property role="TrG5h" value="resOk" />
+              <node concept="3uibUv" id="2PEDwPS8g62" role="1tU5fm">
+                <ref role="3uigEE" node="2PEDwPSdka2" resolve="Containment.E" />
+                <node concept="3qUE_q" id="2PEDwPS8lry" role="11_B2D">
+                  <node concept="3uibUv" id="2PEDwPS8ggV" role="3qUE_r">
+                    <ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
+                    <node concept="3qTvmN" id="2PEDwPS8gql" role="11_B2D" />
                   </node>
                 </node>
-                <node concept="37vLTw" id="2PEDwPS8dMR" role="33vP2m">
-                  <ref role="3cqZAo" node="PltxfHwdmA" resolve="e" />
-                </node>
-                <node concept="1U20sH" id="3mytCjZkw$A" role="lGtFl">
-                  <property role="1U20sK" value="error" />
-                </node>
               </node>
-            </node>
-            <node concept="3cpWs8" id="2PEDwPS8g60" role="3cqZAp">
-              <node concept="3cpWsn" id="2PEDwPS8g61" role="3cpWs9">
-                <property role="TrG5h" value="resOk" />
-                <node concept="3uibUv" id="2PEDwPS8g62" role="1tU5fm">
-                  <ref role="3uigEE" node="2PEDwPSdka2" resolve="Containment.E" />
-                  <node concept="3qUE_q" id="2PEDwPS8lry" role="11_B2D">
-                    <node concept="3uibUv" id="2PEDwPS8ggV" role="3qUE_r">
-                      <ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
-                      <node concept="3qTvmN" id="2PEDwPS8gql" role="11_B2D" />
-                    </node>
-                  </node>
-                </node>
-                <node concept="37vLTw" id="2PEDwPS8g64" role="33vP2m">
-                  <ref role="3cqZAo" node="PltxfHwdmA" resolve="e" />
-                </node>
+              <node concept="37vLTw" id="2PEDwPS8g64" role="33vP2m">
+                <ref role="3cqZAo" node="PltxfHwdmA" resolve="e" />
               </node>
             </node>
           </node>
-          <node concept="3Tm1VV" id="PltxfHwdmO" role="1B3o_S" />
-          <node concept="3cqZAl" id="PltxfHwdmP" role="3clF45" />
-          <node concept="16euLQ" id="PltxfHwdmQ" role="16eVyc">
-            <property role="TrG5h" value="S" />
-            <node concept="3uibUv" id="PltxfHwdmS" role="3ztrMU">
-              <ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
-              <node concept="3qTvmN" id="PltxfHwdmT" role="11_B2D" />
-            </node>
+        </node>
+        <node concept="3Tm1VV" id="PltxfHwdmO" role="1B3o_S" />
+        <node concept="3cqZAl" id="PltxfHwdmP" role="3clF45" />
+        <node concept="16euLQ" id="PltxfHwdmQ" role="16eVyc">
+          <property role="TrG5h" value="S" />
+          <node concept="3uibUv" id="PltxfHwdmS" role="3ztrMU">
+            <ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
+            <node concept="3qTvmN" id="PltxfHwdmT" role="11_B2D" />
           </node>
-          <node concept="16euLQ" id="2PEDwPS8uhk" role="16eVyc">
-            <property role="TrG5h" value="SD" />
-            <node concept="3uibUv" id="2PEDwPS8upi" role="3ztrMU">
-              <ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
-              <node concept="3uibUv" id="2PEDwPS8usY" role="11_B2D">
-                <ref role="3uigEE" to="wyt6:~Double" resolve="Double" />
-              </node>
+        </node>
+        <node concept="16euLQ" id="2PEDwPS8uhk" role="16eVyc">
+          <property role="TrG5h" value="SD" />
+          <node concept="3uibUv" id="2PEDwPS8upi" role="3ztrMU">
+            <ref role="3uigEE" to="wyt6:~Comparable" resolve="Comparable" />
+            <node concept="3uibUv" id="2PEDwPS8usY" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Double" resolve="Double" />
             </node>
           </node>
         </node>
@@ -1874,9 +1866,9 @@
                   <node concept="liA8E" id="4ObboSeq6pg" role="2OqNvi">
                     <ref role="37wK5l" node="4ObboSeq3Tj" resolve="get" />
                   </node>
-                </node>
-                <node concept="1U20sH" id="4ObboSeqhJt" role="lGtFl">
-                  <property role="1U20sK" value="error" />
+                  <node concept="1U20sH" id="3R6X$QWPBez" role="lGtFl">
+                    <property role="1U20sK" value="error" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -1895,9 +1887,9 @@
                   <node concept="liA8E" id="4ObboSeq7s3" role="2OqNvi">
                     <ref role="37wK5l" node="4ObboSeq3Tj" resolve="get" />
                   </node>
-                </node>
-                <node concept="1U20sH" id="4ObboSeqi64" role="lGtFl">
-                  <property role="1U20sK" value="error" />
+                  <node concept="1U20sH" id="3R6X$QWPA99" role="lGtFl">
+                    <property role="1U20sK" value="error" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -1916,9 +1908,9 @@
                   <node concept="liA8E" id="4ObboSeqaOR" role="2OqNvi">
                     <ref role="37wK5l" node="4ObboSeq3Tj" resolve="get" />
                   </node>
-                </node>
-                <node concept="1U20sH" id="4ObboSeqitt" role="lGtFl">
-                  <property role="1U20sK" value="error" />
+                  <node concept="1U20sH" id="3R6X$QWP$J_" role="lGtFl">
+                    <property role="1U20sK" value="error" />
+                  </node>
                 </node>
               </node>
             </node>
@@ -2037,10 +2029,115 @@
         </node>
       </node>
       <node concept="2tJIrI" id="4ObboSeqcmw" role="jymVt" />
+      <node concept="2tJIrI" id="4ObboSeF_gC" role="jymVt" />
+      <node concept="3clFb_" id="4ObboSeETwX" role="jymVt">
+        <property role="TrG5h" value="partialInference" />
+        <node concept="37vLTG" id="4ObboSeETwY" role="3clF46">
+          <property role="TrG5h" value="e1" />
+          <node concept="3uibUv" id="4ObboSeETwZ" role="1tU5fm">
+            <ref role="3uigEE" node="2PEDwPSdka2" resolve="Containment.E" />
+            <node concept="16syzq" id="4ObboSeEWpS" role="11_B2D">
+              <ref role="16sUi3" node="4ObboSeETxz" resolve="T1" />
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="4ObboSeETx1" role="3clF46">
+          <property role="TrG5h" value="e2" />
+          <node concept="3uibUv" id="4ObboSeETx2" role="1tU5fm">
+            <ref role="3uigEE" node="2PEDwPSdka2" resolve="Containment.E" />
+            <node concept="3qTvmN" id="4ObboSeETx3" role="11_B2D" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4ObboSeETx4" role="3clF47">
+          <node concept="3cpWs8" id="4ObboSeEYgU" role="3cqZAp">
+            <node concept="3cpWsn" id="4ObboSeEYgX" role="3cpWs9">
+              <property role="TrG5h" value="t1" />
+              <node concept="16syzq" id="4ObboSeEYgT" role="1tU5fm">
+                <ref role="16sUi3" node="4ObboSeETxz" resolve="T1" />
+              </node>
+              <node concept="2OqwBi" id="4ObboSeEZp8" role="33vP2m">
+                <node concept="37vLTw" id="4ObboSeEZeJ" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4ObboSeETwY" resolve="e1" />
+                </node>
+                <node concept="liA8E" id="4ObboSeF08j" role="2OqNvi">
+                  <ref role="37wK5l" node="4ObboSeq3Tj" resolve="get" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3cpWs8" id="4ObboSeF0$A" role="3cqZAp">
+            <node concept="3cpWsn" id="4ObboSeF0$D" role="3cpWs9">
+              <property role="TrG5h" value="t2" />
+              <node concept="16syzq" id="4ObboSeF0$$" role="1tU5fm">
+                <ref role="16sUi3" node="4ObboSeEUrd" resolve="T2" />
+              </node>
+              <node concept="10Nm6u" id="4ObboSeF0UE" role="33vP2m" />
+            </node>
+          </node>
+          <node concept="3cpWs6" id="4ObboSeFe7V" role="3cqZAp">
+            <node concept="37vLTw" id="4ObboSeFe8p" role="3cqZAk">
+              <ref role="3cqZAo" node="4ObboSeF0$D" resolve="t2" />
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="4ObboSeETxx" role="1B3o_S" />
+        <node concept="16syzq" id="4ObboSeFdJn" role="3clF45">
+          <ref role="16sUi3" node="4ObboSeEUrd" resolve="T2" />
+        </node>
+        <node concept="16euLQ" id="4ObboSeETxz" role="16eVyc">
+          <property role="TrG5h" value="T1" />
+        </node>
+        <node concept="16euLQ" id="4ObboSeEUrd" role="16eVyc">
+          <property role="TrG5h" value="T2" />
+        </node>
+      </node>
+      <node concept="2tJIrI" id="4ObboSeETqe" role="jymVt" />
+      <node concept="3clFb_" id="4ObboSeFgcL" role="jymVt">
+        <property role="TrG5h" value="usePartialInference" />
+        <node concept="37vLTG" id="4ObboSeFjsH" role="3clF46">
+          <property role="TrG5h" value="ed" />
+          <node concept="3uibUv" id="4ObboSeFjNf" role="1tU5fm">
+            <ref role="3uigEE" node="2PEDwPSdka2" resolve="Containment.E" />
+            <node concept="3uibUv" id="4ObboSeFkL0" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Double" resolve="Double" />
+            </node>
+          </node>
+        </node>
+        <node concept="37vLTG" id="4ObboSeFl5K" role="3clF46">
+          <property role="TrG5h" value="eb" />
+          <node concept="3uibUv" id="4ObboSeFl8a" role="1tU5fm">
+            <ref role="3uigEE" node="2PEDwPSdka2" resolve="Containment.E" />
+            <node concept="3uibUv" id="4ObboSeFlLG" role="11_B2D">
+              <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbS" id="4ObboSeFgcO" role="3clF47">
+          <node concept="3cpWs8" id="4ObboSeFmK2" role="3cqZAp">
+            <node concept="3cpWsn" id="4ObboSeFmK3" role="3cpWs9">
+              <property role="TrG5h" value="b1" />
+              <node concept="3uibUv" id="4ObboSeFmK4" role="1tU5fm">
+                <ref role="3uigEE" to="wyt6:~Boolean" resolve="Boolean" />
+              </node>
+              <node concept="1rXfSq" id="4ObboSeFomG" role="33vP2m">
+                <ref role="37wK5l" node="4ObboSeETwX" resolve="partialInference" />
+                <node concept="37vLTw" id="4ObboSeFp0v" role="37wK5m">
+                  <ref role="3cqZAo" node="4ObboSeFjsH" resolve="ed" />
+                </node>
+                <node concept="37vLTw" id="4ObboSeFpKc" role="37wK5m">
+                  <ref role="3cqZAo" node="4ObboSeFl5K" resolve="eb" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm1VV" id="4ObboSeFfaT" role="1B3o_S" />
+        <node concept="3cqZAl" id="4ObboSeFffI" role="3clF45" />
+      </node>
+      <node concept="2tJIrI" id="4ObboSeETsP" role="jymVt" />
       <node concept="3Tm1VV" id="2PEDwPSdka9" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="2PEDwPSdbcD" role="jymVt" />
-    <node concept="2tJIrI" id="2PEDwPSdabx" role="jymVt" />
     <node concept="3Tm1VV" id="2PEDwPSdaaE" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="3yhgKRJ29Qs">