diff --git a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
index ab3ba5e7..5271e288 100644
--- a/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.typechecking/models/jetbrains.mps.coderules.typechecking.service.mps
@@ -1529,44 +1529,13 @@
                                   <node concept="3clFbH" id="pupwRq_TxV" role="3cqZAp" />
                                 </node>
                                 <node concept="3fqX7Q" id="pupwRqAWyT" role="3clFbw">
-                                  <node concept="2OqwBi" id="pupwRqAWyV" role="3fr31v">
-                                    <node concept="2OqwBi" id="pupwRqAWyW" role="2Oq$k0">
-                                      <node concept="37vLTw" id="pupwRqAWyX" role="2Oq$k0">
-                                        <ref role="3cqZAo" node="pupwRq_wfv" resolve="untypedNode" />
-                                      </node>
-                                      <node concept="2Rf3mk" id="pupwRqAWyY" role="2OqNvi">
-                                        <node concept="1xMEDy" id="pupwRqAWyZ" role="1xVPHs">
-                                          <node concept="chp4Y" id="pupwRqAWz0" role="ri$Ld">
-                                            <ref role="cht4Q" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                          </node>
-                                        </node>
-                                        <node concept="1xIGOp" id="pupwRqAWz1" role="1xVPHs" />
-                                      </node>
+                                  <node concept="1rXfSq" id="4AYiKM_M5Ji" role="3fr31v">
+                                    <ref role="37wK5l" node="4AYiKM_LMDy" resolve="anyDescendantIn" />
+                                    <node concept="37vLTw" id="4AYiKM_M8eB" role="37wK5m">
+                                      <ref role="3cqZAo" node="pupwRq_wfv" resolve="untypedNode" />
                                     </node>
-                                    <node concept="2HwmR7" id="pupwRqAWz2" role="2OqNvi">
-                                      <node concept="1bVj0M" id="pupwRqAWz3" role="23t8la">
-                                        <node concept="3clFbS" id="pupwRqAWz4" role="1bW5cS">
-                                          <node concept="3clFbF" id="pupwRqAWz5" role="3cqZAp">
-                                            <node concept="2OqwBi" id="pupwRqAWz6" role="3clFbG">
-                                              <node concept="37vLTw" id="pupwRqEnBK" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="pupwRqBP9E" resolve="typecheckingErrNodes" />
-                                              </node>
-                                              <node concept="3JPx81" id="pupwRqAWz8" role="2OqNvi">
-                                                <node concept="2OqwBi" id="pupwRqAWz9" role="25WWJ7">
-                                                  <node concept="37vLTw" id="pupwRqAWza" role="2Oq$k0">
-                                                    <ref role="3cqZAo" node="pupwRqAWzc" resolve="it" />
-                                                  </node>
-                                                  <node concept="iZEcu" id="pupwRqAWzb" role="2OqNvi" />
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                        <node concept="Rh6nW" id="pupwRqAWzc" role="1bW2Oz">
-                                          <property role="TrG5h" value="it" />
-                                          <node concept="2jxLKc" id="pupwRqAWzd" role="1tU5fm" />
-                                        </node>
-                                      </node>
+                                    <node concept="37vLTw" id="4AYiKM_MdzC" role="37wK5m">
+                                      <ref role="3cqZAo" node="pupwRqBP9E" resolve="typecheckingErrNodes" />
                                     </node>
                                   </node>
                                 </node>
@@ -1720,21 +1689,43 @@
                     <node concept="3clFbH" id="27bTNFfaZ56" role="3cqZAp" />
                     <node concept="3clFbJ" id="27bTNFfaZ57" role="3cqZAp">
                       <node concept="3clFbS" id="27bTNFfaZ58" role="3clFbx">
-                        <node concept="3cpWs8" id="27bTNFfaZ59" role="3cqZAp">
-                          <node concept="3cpWsn" id="27bTNFfaZ5a" role="3cpWs9">
-                            <property role="TrG5h" value="ea" />
-                            <node concept="3Tqbb2" id="27bTNFfaZ5b" role="1tU5fm">
-                              <ref role="ehGHo" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
+                        <node concept="3SKdUt" id="4AYiKM_M$gr" role="3cqZAp">
+                          <node concept="1PaTwC" id="4AYiKM_M$gs" role="3ndbpf">
+                            <node concept="3oM_SD" id="4AYiKM_M$gu" role="1PaTwD">
+                              <property role="3oM_SC" value="if" />
                             </node>
-                            <node concept="2OqwBi" id="27bTNFfaZ5c" role="33vP2m">
-                              <node concept="37vLTw" id="27bTNFfaZ5d" role="2Oq$k0">
-                                <ref role="3cqZAo" node="27bTNFfaZ4Y" resolve="resolve" />
-                              </node>
-                              <node concept="3CFZ6_" id="27bTNFfaZ5e" role="2OqNvi">
-                                <node concept="3CFYIy" id="27bTNFfaZ5f" role="3CFYIz">
-                                  <ref role="3CFYIx" to="wcmu:1FOQehwZdZ9" resolve="ErrorAnnotation" />
-                                </node>
-                              </node>
+                            <node concept="3oM_SD" id="4AYiKM_MAgF" role="1PaTwD">
+                              <property role="3oM_SC" value="there's" />
+                            </node>
+                            <node concept="3oM_SD" id="4AYiKM_MAgI" role="1PaTwD">
+                              <property role="3oM_SC" value="error" />
+                            </node>
+                            <node concept="3oM_SD" id="4AYiKM_MEXg" role="1PaTwD">
+                              <property role="3oM_SC" value="type" />
+                            </node>
+                            <node concept="3oM_SD" id="4AYiKM_MEXl" role="1PaTwD">
+                              <property role="3oM_SC" value="without" />
+                            </node>
+                            <node concept="3oM_SD" id="4AYiKM_MGKk" role="1PaTwD">
+                              <property role="3oM_SC" value="a" />
+                            </node>
+                            <node concept="3oM_SD" id="4AYiKM_MK6H" role="1PaTwD">
+                              <property role="3oM_SC" value="reason" />
+                            </node>
+                            <node concept="3oM_SD" id="4AYiKM_MO$r" role="1PaTwD">
+                              <property role="3oM_SC" value="(i.e." />
+                            </node>
+                            <node concept="3oM_SD" id="4AYiKM_MQhz" role="1PaTwD">
+                              <property role="3oM_SC" value="without" />
+                            </node>
+                            <node concept="3oM_SD" id="4AYiKM_MSGi" role="1PaTwD">
+                              <property role="3oM_SC" value="an" />
+                            </node>
+                            <node concept="3oM_SD" id="4AYiKM_O7qx" role="1PaTwD">
+                              <property role="3oM_SC" value="error" />
+                            </node>
+                            <node concept="3oM_SD" id="4AYiKM_N8A5" role="1PaTwD">
+                              <property role="3oM_SC" value="somewhere" />
                             </node>
                           </node>
                         </node>
@@ -1764,11 +1755,16 @@
                               </node>
                             </node>
                           </node>
-                          <node concept="2OqwBi" id="27bTNFfaZ5t" role="3clFbw">
-                            <node concept="37vLTw" id="27bTNFfaZ5u" role="2Oq$k0">
-                              <ref role="3cqZAo" node="27bTNFfaZ5a" resolve="ea" />
+                          <node concept="3fqX7Q" id="4AYiKM_NEVQ" role="3clFbw">
+                            <node concept="1rXfSq" id="4AYiKM_NEVS" role="3fr31v">
+                              <ref role="37wK5l" node="4AYiKM_LMDy" resolve="anyDescendantIn" />
+                              <node concept="37vLTw" id="4AYiKM_NEVT" role="37wK5m">
+                                <ref role="3cqZAo" node="27bTNFfaZ4Y" resolve="resolve" />
+                              </node>
+                              <node concept="37vLTw" id="4AYiKM_OfUZ" role="37wK5m">
+                                <ref role="3cqZAo" node="pupwRqBP9E" resolve="typecheckingErrNodes" />
+                              </node>
                             </node>
-                            <node concept="3w_OXm" id="27bTNFfaZ5v" role="2OqNvi" />
                           </node>
                         </node>
                       </node>
@@ -1915,6 +1911,66 @@
           </node>
         </node>
       </node>
+      <node concept="2tJIrI" id="4AYiKM_LqMd" role="jymVt" />
+      <node concept="3clFb_" id="4AYiKM_LMDy" role="jymVt">
+        <property role="TrG5h" value="anyDescendantIn" />
+        <node concept="37vLTG" id="4AYiKM_LQme" role="3clF46">
+          <property role="TrG5h" value="node" />
+          <node concept="3Tqbb2" id="4AYiKM_LTPL" role="1tU5fm" />
+        </node>
+        <node concept="37vLTG" id="4AYiKM_LU4D" role="3clF46">
+          <property role="TrG5h" value="scope" />
+          <node concept="3vKaQO" id="4AYiKM_LXb8" role="1tU5fm">
+            <node concept="2sp9CU" id="4AYiKM_LXl1" role="3O5elw" />
+          </node>
+        </node>
+        <node concept="3clFbS" id="4AYiKM_LMD_" role="3clF47">
+          <node concept="3clFbF" id="4AYiKM_LXLE" role="3cqZAp">
+            <node concept="2OqwBi" id="4AYiKM_M0n2" role="3clFbG">
+              <node concept="2OqwBi" id="4AYiKM_LXTJ" role="2Oq$k0">
+                <node concept="37vLTw" id="4AYiKM_LXLD" role="2Oq$k0">
+                  <ref role="3cqZAo" node="4AYiKM_LQme" resolve="node" />
+                </node>
+                <node concept="2Rf3mk" id="4AYiKM_LY7W" role="2OqNvi">
+                  <node concept="1xMEDy" id="4AYiKM_LY7Y" role="1xVPHs">
+                    <node concept="chp4Y" id="4AYiKM_LZ0T" role="ri$Ld">
+                      <ref role="cht4Q" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                    </node>
+                  </node>
+                  <node concept="1xIGOp" id="4AYiKM_LZgm" role="1xVPHs" />
+                </node>
+              </node>
+              <node concept="2HwmR7" id="4AYiKM_M1$$" role="2OqNvi">
+                <node concept="1bVj0M" id="4AYiKM_M1$A" role="23t8la">
+                  <node concept="3clFbS" id="4AYiKM_M1$B" role="1bW5cS">
+                    <node concept="3clFbF" id="4AYiKM_M1Dl" role="3cqZAp">
+                      <node concept="2OqwBi" id="4AYiKM_M2fr" role="3clFbG">
+                        <node concept="37vLTw" id="4AYiKM_M1Dk" role="2Oq$k0">
+                          <ref role="3cqZAo" node="4AYiKM_LU4D" resolve="scope" />
+                        </node>
+                        <node concept="3JPx81" id="4AYiKM_M2Qq" role="2OqNvi">
+                          <node concept="2OqwBi" id="4AYiKM_M35K" role="25WWJ7">
+                            <node concept="37vLTw" id="4AYiKM_M2Ut" role="2Oq$k0">
+                              <ref role="3cqZAo" node="4AYiKM_M1$C" resolve="it" />
+                            </node>
+                            <node concept="iZEcu" id="4AYiKM_M3ej" role="2OqNvi" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="Rh6nW" id="4AYiKM_M1$C" role="1bW2Oz">
+                    <property role="TrG5h" value="it" />
+                    <node concept="2jxLKc" id="4AYiKM_M1$D" role="1tU5fm" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3Tm6S6" id="4AYiKM_LItj" role="1B3o_S" />
+        <node concept="10P_77" id="4AYiKM_LM_m" role="3clF45" />
+      </node>
       <node concept="2tJIrI" id="4ZGicUZ0Yjs" role="jymVt" />
       <node concept="3clFb_" id="4ZGicUZ1a_d" role="jymVt">
         <property role="TrG5h" value="checkMatches" />