diff --git a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
index 6e152746..284eba70 100644
--- a/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
+++ b/samples/mpscore/languages/jetbrains.mps.baseLanguageExt/models/controlflow.mps
@@ -850,9 +850,6 @@
                     <node concept="a7P8L" id="5pIcDR7JOv0" role="3AunhB">
                       <ref role="a7OzE" node="5pIcDR7JOew" resolve="RSite" />
                     </node>
-                    <node concept="a7P8L" id="5pIcDR7JOvc" role="3AunhB">
-                      <ref role="a7OzE" node="5pIcDR7JOez" resolve="Node" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -917,9 +914,6 @@
                     <node concept="a7P8L" id="5pIcDR7JOvE" role="3AunhB">
                       <ref role="a7OzE" node="5pIcDR7JOew" resolve="RSite" />
                     </node>
-                    <node concept="a7P8L" id="5pIcDR7JOvF" role="3AunhB">
-                      <ref role="a7OzE" node="5pIcDR7JOez" resolve="Node" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -1062,7 +1056,7 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="5YmBCzQNbn7" role="3cqZAp" />
+            <node concept="3clFbH" id="2Uh$R6pDymb" role="3cqZAp" />
             <node concept="1nLNNL" id="5YmBCzQNbn8" role="3cqZAp">
               <node concept="1nLNMm" id="5YmBCzQNbn9" role="1nLNNK">
                 <node concept="3Aq93q" id="FAZzzipfJn" role="1nLNMb">
@@ -1089,9 +1083,6 @@
                         <node concept="a7P8L" id="5pIcDR7JNl5" role="3AunhB">
                           <ref role="a7OzE" node="5pIcDR7JNkR" resolve="RSite" />
                         </node>
-                        <node concept="a7P8L" id="5pIcDR7JNlo" role="3AunhB">
-                          <ref role="a7OzE" node="5pIcDR7JNkU" resolve="Node" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -1180,9 +1171,6 @@
                         <node concept="a7P8L" id="5pIcDR7JNm7" role="3AunhB">
                           <ref role="a7OzE" node="5pIcDR7JNkR" resolve="RSite" />
                         </node>
-                        <node concept="a7P8L" id="5pIcDR7JNm8" role="3AunhB">
-                          <ref role="a7OzE" node="5pIcDR7JNkU" resolve="Node" />
-                        </node>
                       </node>
                     </node>
                   </node>
@@ -1215,7 +1203,7 @@
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="FAZzzit0vy" role="3cqZAp" />
+            <node concept="3clFbH" id="5YmBCzQNbn7" role="3cqZAp" />
             <node concept="1nLNNL" id="5YmBCzQNbn$" role="3cqZAp">
               <node concept="1nLNMm" id="5YmBCzQNbn_" role="1nLNNK">
                 <node concept="3Aq93q" id="5YmBCzQNbnA" role="1nLNMb">
@@ -1273,190 +1261,18 @@
           </node>
           <node concept="9aQIb" id="5YmBCzQLxAq" role="9aQIa">
             <node concept="3clFbS" id="5YmBCzQLxAr" role="9aQI4">
-              <node concept="1nLNNL" id="6Yb9hAqOcnb" role="3cqZAp">
-                <node concept="1nLNMm" id="6Yb9hAqOcnc" role="1nLNNK">
-                  <node concept="3Aq93q" id="6Yb9hAqOcnZ" role="1nLNMb">
+              <node concept="1nLNNL" id="AoTMCCZmL9" role="3cqZAp">
+                <node concept="1nLNMm" id="AoTMCCZmLa" role="1nLNNK">
+                  <node concept="3Aq93q" id="2Uh$R6pDyWg" role="1nLNMb">
                     <property role="3ArMco" value="true" />
-                    <node concept="3I6sU6" id="6Yb9hAqOco0" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="6Yb9hAqOcoO" role="3I6sU7">
-                        <node concept="3Aqt3T" id="6Yb9hAqOcoN" role="3I6s78">
+                    <node concept="3I6sU6" id="2Uh$R6pDyWh" role="3Ip0Jz">
+                      <node concept="3I6s7M" id="2Uh$R6pDyWr" role="3I6sU7">
+                        <node concept="3Aqt3T" id="2Uh$R6pDyWq" role="3I6s78">
                           <ref role="3AqCNq" node="78H58oeAof4" resolve="checkAll" />
                         </node>
                       </node>
                     </node>
                   </node>
-                  <node concept="3Aq9E8" id="6Yb9hAqOcpB" role="1nLNMd">
-                    <node concept="3I6sU6" id="6Yb9hAqOcpC" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="6Yb9hAqOcqs" role="3I6sU7">
-                        <node concept="3Aqt3T" id="6Yb9hAqOcqr" role="3I6s78">
-                          <ref role="3AqCNq" node="6Yb9hAqObIb" resolve="uninitializedRead" />
-                          <node concept="3BlFb$" id="6Yb9hAqOcs1" role="3AunhB">
-                            <node concept="3A2sRY" id="6Yb9hAqOcsU" role="3BlFb_">
-                              <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="5YmBCzQLxA_" role="3cqZAp" />
-              <node concept="1nLNNL" id="5YmBCzQRYvi" role="3cqZAp">
-                <node concept="1nLNMm" id="5YmBCzQRYvk" role="1nLNNK">
-                  <node concept="3Aq93q" id="5YmBCzQRYwd" role="1nLNMb">
-                    <property role="3ArMco" value="true" />
-                    <node concept="3I6sU6" id="5YmBCzQRYwe" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="5pIcDR7JNmP" role="3I6sU7">
-                        <node concept="3Aqt3T" id="5pIcDR7JNmK" role="3I6s78">
-                          <ref role="3AqCNq" node="7pxta7vmNbZ" resolve="used" />
-                          <node concept="3BlFb$" id="5pIcDR7JNmX" role="3AunhB">
-                            <node concept="2OqwBi" id="5pIcDR7JNBw" role="3BlFb_">
-                              <node concept="3A2sRY" id="5pIcDR7JNn4" role="2Oq$k0">
-                                <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                              </node>
-                              <node concept="3TrEf2" id="5pIcDR7JNUy" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="a7P8L" id="5pIcDR7K_9Q" role="3AunhB">
-                            <ref role="a7OzE" node="5pIcDR7K_9I" resolve="WSite" />
-                          </node>
-                          <node concept="3BlFb$" id="5pIcDR7M8zp" role="3AunhB">
-                            <node concept="3A2sRY" id="5pIcDR7M8zR" role="3BlFb_">
-                              <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                            </node>
-                          </node>
-                          <node concept="a7P8L" id="5pIcDR7K_a8" role="3AunhB">
-                            <ref role="a7OzE" node="5pIcDR7K_9K" resolve="Node2" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3Aq93q" id="5YmBCzQRZbU" role="1nLNMb">
-                    <property role="3ArMco" value="false" />
-                    <node concept="3I6sU6" id="5YmBCzQRZbV" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="5YmBCzQRZbW" role="3I6sU7">
-                        <node concept="3Aqt3T" id="5YmBCzQRZbX" role="3I6s78">
-                          <ref role="3AqCNq" node="6Yb9hAqObIb" resolve="uninitializedRead" />
-                          <node concept="3BlFb$" id="5YmBCzQRZbY" role="3AunhB">
-                            <node concept="3A2sRY" id="5YmBCzQRZbZ" role="3BlFb_">
-                              <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3Aq9E8" id="5YmBCzQRZaL" role="1nLNMd">
-                    <node concept="3I6sU6" id="5YmBCzQRZaM" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="5YmBCzQRZcg" role="3I6sU7">
-                        <node concept="3wWvb2" id="5YmBCzQRZch" role="3I6s78">
-                          <node concept="2OqwBi" id="5YmBCzQRZci" role="3wWo3s">
-                            <node concept="3A2sRY" id="5YmBCzQRZcj" role="2Oq$k0">
-                              <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                            </node>
-                            <node concept="2s7oft" id="5YmBCzQRZck" role="2OqNvi">
-                              <property role="2s7ueQ" value="error" />
-                              <node concept="Xl_RD" id="5YmBCzQRZcl" role="2s7u9n">
-                                <property role="Xl_RC" value="uninitialized read" />
-                              </node>
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3Aq9_M" id="5pIcDR7JNVf" role="1nLNMa">
-                    <node concept="3I6sU6" id="5pIcDR7JNVg" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="5pIcDR7JNVk" role="3I6sU7">
-                        <node concept="2aLmEc" id="5pIcDR7JNVj" role="3I6s78">
-                          <node concept="a7P8L" id="5pIcDR7K_ah" role="2aLmnP">
-                            <ref role="a7OzE" node="5pIcDR7K_9I" resolve="WSite" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="0eUR_" id="5pIcDR7K_9G" role="0UC6o">
-                    <node concept="3NuqgR" id="5pIcDR7K_9H" role="0eVf_">
-                      <node concept="aZer4" id="5pIcDR7K_9I" role="3XD1gS">
-                        <property role="TrG5h" value="WSite" />
-                      </node>
-                      <node concept="aZer4" id="5pIcDR7K_9K" role="3XD1gS">
-                        <property role="TrG5h" value="Node2" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="5YmBCzQRZaP" role="3cqZAp" />
-              <node concept="1nLNNL" id="6Yb9hAqOcZl" role="3cqZAp">
-                <node concept="1nLNMm" id="6Yb9hAqOcZm" role="1nLNNK">
-                  <node concept="3Aq93q" id="FAZzzipfL$" role="1nLNMb">
-                    <property role="3ArMco" value="true" />
-                    <node concept="3I6sU6" id="FAZzzipfL_" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="5pIcDR7JNVv" role="3I6sU7">
-                        <node concept="3Aqt3T" id="5pIcDR7JNVw" role="3I6s78">
-                          <ref role="3AqCNq" node="7pxta7vmNbZ" resolve="used" />
-                          <node concept="3BlFb$" id="5pIcDR7JNVx" role="3AunhB">
-                            <node concept="2OqwBi" id="5pIcDR7JNVy" role="3BlFb_">
-                              <node concept="3A2sRY" id="5pIcDR7JNVz" role="2Oq$k0">
-                                <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                              </node>
-                              <node concept="3TrEf2" id="5pIcDR7JNV$" role="2OqNvi">
-                                <ref role="3Tt5mk" to="tpee:fzcqZ_w" resolve="variableDeclaration" />
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="a7P8L" id="5pIcDR7K_ak" role="3AunhB">
-                            <ref role="a7OzE" node="5pIcDR7K_9I" resolve="WSite" />
-                          </node>
-                          <node concept="3BlFb$" id="5pIcDR7M8zU" role="3AunhB">
-                            <node concept="3A2sRY" id="5pIcDR7M8$6" role="3BlFb_">
-                              <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                            </node>
-                          </node>
-                          <node concept="a7P8L" id="5pIcDR7K_aA" role="3AunhB">
-                            <ref role="a7OzE" node="5pIcDR7K_9K" resolve="Node2" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3Aq93q" id="6Yb9hAqOd09" role="1nLNMb">
-                    <property role="3ArMco" value="false" />
-                    <node concept="3I6sU6" id="6Yb9hAqOd0a" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="6Yb9hAqOd0Y" role="3I6sU7">
-                        <node concept="3Aqt3T" id="6Yb9hAqOd0X" role="3I6s78">
-                          <ref role="3AqCNq" node="6Yb9hAqObIb" resolve="uninitializedRead" />
-                          <node concept="3BlFb$" id="6Yb9hAqOd3k" role="3AunhB">
-                            <node concept="3A2sRY" id="6F9w2VbPMN7" role="3BlFb_">
-                              <ref role="3A2yKK" node="6Yb9hAqOc4n" resolve="varref" />
-                            </node>
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                  <node concept="3Aq9_M" id="5pIcDR7JNVS" role="1nLNMa">
-                    <node concept="3I6sU6" id="5pIcDR7JNVT" role="3Ip0Jz">
-                      <node concept="3I6s7M" id="5pIcDR7JNVX" role="3I6sU7">
-                        <node concept="2aM9Np" id="5pIcDR7JNVW" role="3I6s78">
-                          <node concept="a7P8L" id="5pIcDR7K_aJ" role="2aLmnP">
-                            <ref role="a7OzE" node="5pIcDR7K_9I" resolve="WSite" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbH" id="AoTMCCZmNt" role="3cqZAp" />
-              <node concept="1nLNNL" id="AoTMCCZmL9" role="3cqZAp">
-                <node concept="1nLNMm" id="AoTMCCZmLa" role="1nLNNK">
                   <node concept="3Aq9E8" id="AoTMCCZmSB" role="1nLNMd">
                     <node concept="3I6sU6" id="AoTMCCZmSC" role="3Ip0Jz">
                       <node concept="3I6s7M" id="AoTMCCZmSF" role="3I6sU7">
@@ -5496,9 +5312,6 @@
                         <node concept="a7P8L" id="7pxta7vmQAm" role="3AunhB">
                           <ref role="a7OzE" node="7pxta7vmQAD" resolve="Node" />
                         </node>
-                        <node concept="a7P8L" id="7pxta7vmQAn" role="3AunhB">
-                          <ref role="a7OzE" node="7pxta7vmQAD" resolve="Node" />
-                        </node>
                       </node>
                     </node>
                     <node concept="3Aqczg" id="PYgJzEqgUH" role="3cqZAp">
@@ -5744,6 +5557,110 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbH" id="2Uh$R6pCkAS" role="3cqZAp" />
+        <node concept="1nLNNL" id="2Uh$R6pCkD8" role="3cqZAp">
+          <node concept="1nLNMm" id="2Uh$R6pCkDa" role="1nLNNK">
+            <node concept="3Aq93q" id="2Uh$R6pCkDX" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="2Uh$R6pCkDY" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Uh$R6pCkE2" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Uh$R6pCkE1" role="3I6s78">
+                    <ref role="3AqCNq" node="22$xxOvZhlA" resolve="used_visit" />
+                    <node concept="a7P8L" id="2Uh$R6pCkE$" role="3AunhB">
+                      <ref role="a7OzE" node="5pIcDR7wW2m" resolve="Loc" />
+                    </node>
+                    <node concept="a7P8L" id="2Uh$R6pCkEd" role="3AunhB">
+                      <ref role="a7OzE" node="5pIcDR7wVV6" resolve="Uses" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="2Uh$R6pCkEh" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="2Uh$R6pCkEi" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Uh$R6pCkEs" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Uh$R6pCkEr" role="3I6s78">
+                    <ref role="3AqCNq" node="2Uh$R6pCiqX" resolve="loc" />
+                    <node concept="a7P8L" id="2Uh$R6pCkEC" role="3AunhB">
+                      <ref role="a7OzE" node="5pIcDR7wW2m" resolve="Loc" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq93q" id="2Uh$R6pDyY3" role="1nLNMb">
+              <property role="3ArMco" value="true" />
+              <node concept="3I6sU6" id="2Uh$R6pDyY4" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Uh$R6pDyYj" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Uh$R6pDyYi" role="3I6s78">
+                    <ref role="3AqCNq" node="6Yb9hAqNHxU" resolve="read" />
+                    <node concept="a7P8L" id="2Uh$R6pDyYo" role="3AunhB">
+                      <ref role="a7OzE" node="5pIcDR7wW2m" resolve="Loc" />
+                    </node>
+                    <node concept="a7P8L" id="2Uh$R6pD_1M" role="3AunhB">
+                      <ref role="a7OzE" node="2Uh$R6pD_1J" resolve="RSite" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9E8" id="2Uh$R6pCkEF" role="1nLNMd">
+              <node concept="3I6sU6" id="2Uh$R6pCkEG" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Uh$R6pD_1U" role="3I6sU7">
+                  <node concept="3Aqt3T" id="2Uh$R6pD_1T" role="3I6s78">
+                    <ref role="3AqCNq" node="6Yb9hAqObIb" resolve="uninitializedRead" />
+                    <node concept="a7P8L" id="2Uh$R6pEmoI" role="3AunhB">
+                      <ref role="a7OzE" node="2Uh$R6pD_1J" resolve="RSite" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3Aq9_M" id="2Uh$R6pCkEL" role="1nLNMa">
+              <node concept="3I6sU6" id="2Uh$R6pCkEM" role="3Ip0Jz">
+                <node concept="3I6s7M" id="2Uh$R6pCkEQ" role="3I6sU7">
+                  <node concept="3wWvb2" id="2Uh$R6pCkEP" role="3I6s78">
+                    <node concept="2OqwBi" id="2Uh$R6pDzZN" role="3wWo3s">
+                      <node concept="3EllGN" id="2Uh$R6pDznl" role="2Oq$k0">
+                        <node concept="1TmgYN" id="2Uh$R6pDznD" role="3ElVtu">
+                          <node concept="1nq8_$" id="2Uh$R6pDznL" role="1Tms7$">
+                            <node concept="a7P8L" id="2Uh$R6pDznJ" role="1nq8_t">
+                              <ref role="a7OzE" node="5pIcDR7wW2m" resolve="Loc" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="1TmgYN" id="2Uh$R6pCkET" role="3ElQJh">
+                          <node concept="1nq8_$" id="2Uh$R6pCkEZ" role="1Tms7$">
+                            <node concept="a7P8L" id="2Uh$R6pCkEX" role="1nq8_t">
+                              <ref role="a7OzE" node="5pIcDR7wVV6" resolve="Uses" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3JPx81" id="2Uh$R6pD_1q" role="2OqNvi">
+                        <node concept="1TmgYN" id="2Uh$R6pD_1w" role="25WWJ7">
+                          <node concept="1nq8_$" id="2Uh$R6pD_1C" role="1Tms7$">
+                            <node concept="a7P8L" id="2Uh$R6pD_1Q" role="1nq8_t">
+                              <ref role="a7OzE" node="2Uh$R6pD_1J" resolve="RSite" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="0eUR_" id="2Uh$R6pD_1G" role="0UC6o">
+              <node concept="3NuqgR" id="2Uh$R6pD_1I" role="0eVf_">
+                <node concept="aZer4" id="2Uh$R6pD_1J" role="3XD1gS">
+                  <property role="TrG5h" value="RSite" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
     <node concept="1nLNMY" id="7pxta7vmNhW" role="1nK1Vg">
@@ -5827,9 +5744,6 @@
                     <node concept="a7P8L" id="7pxta7v$DQL" role="3AunhB">
                       <ref role="a7OzE" node="7pxta7vt7CG" resolve="FreshRSite" />
                     </node>
-                    <node concept="a7P8L" id="7pxta7vt7Dy" role="3AunhB">
-                      <ref role="a7OzE" node="7pxta7vmQCa" resolve="Node" />
-                    </node>
                   </node>
                 </node>
                 <node concept="3I6s7M" id="7pxta7vBwzr" role="3I6sU7">
@@ -5964,9 +5878,6 @@
                     <node concept="a7P8L" id="PYgJzEfkoK" role="3AunhB">
                       <ref role="a7OzE" node="PYgJzEfgTS" resolve="RSite2" />
                     </node>
-                    <node concept="a7P8L" id="PYgJzEfh7j" role="3AunhB">
-                      <ref role="a7OzE" node="PYgJzEfgQH" resolve="Node" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -5986,9 +5897,6 @@
                     <node concept="a7P8L" id="PYgJzEfkpA" role="3AunhB">
                       <ref role="a7OzE" node="PYgJzEfgOp" resolve="RSite" />
                     </node>
-                    <node concept="a7P8L" id="PYgJzEfhch" role="3AunhB">
-                      <ref role="a7OzE" node="PYgJzEfgXJ" resolve="Node2" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -6010,12 +5918,6 @@
                 <node concept="aZer4" id="PYgJzEfgTS" role="3XD1gS">
                   <property role="TrG5h" value="RSite2" />
                 </node>
-                <node concept="aZer4" id="PYgJzEfgQH" role="3XD1gS">
-                  <property role="TrG5h" value="Node" />
-                </node>
-                <node concept="aZer4" id="PYgJzEfgXJ" role="3XD1gS">
-                  <property role="TrG5h" value="Node2" />
-                </node>
               </node>
               <node concept="3NuqgR" id="PYgJzEfiKC" role="0eVf_">
                 <node concept="aZer4" id="PYgJzEfhvA" role="3XD1gS">
@@ -6132,9 +6034,6 @@
                     <node concept="a7P8L" id="5pIcDR7sJqO" role="3AunhB">
                       <ref role="a7OzE" node="PYgJzEfgTS" resolve="RSite2" />
                     </node>
-                    <node concept="a7P8L" id="5pIcDR7sJqI" role="3AunhB">
-                      <ref role="a7OzE" node="PYgJzEfgQH" resolve="Node" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -6154,9 +6053,6 @@
                     <node concept="a7P8L" id="5pIcDR7sJoW" role="3AunhB">
                       <ref role="a7OzE" node="PYgJzEfgOp" resolve="RSite" />
                     </node>
-                    <node concept="a7P8L" id="5pIcDR7sJoQ" role="3AunhB">
-                      <ref role="a7OzE" node="PYgJzEfgXJ" resolve="Node2" />
-                    </node>
                   </node>
                 </node>
               </node>
@@ -6479,6 +6375,12 @@
         <property role="TrG5h" value="site" />
       </node>
     </node>
+    <node concept="3AqmO8" id="2Uh$R6pCiqX" role="8PkJo">
+      <property role="TrG5h" value="loc" />
+      <node concept="1zAUYm" id="2Uh$R6pCirz" role="1zAUyy">
+        <property role="TrG5h" value="loc" />
+      </node>
+    </node>
     <node concept="3AqmO8" id="AoTMCCYnN1" role="8PkJo">
       <property role="TrG5h" value="rw" />
     </node>
@@ -6502,9 +6404,6 @@
       <node concept="1zAUYm" id="7pxta7vrjEB" role="1zAUyy">
         <property role="TrG5h" value="rsite" />
       </node>
-      <node concept="1zAUYm" id="7pxta7vrjEC" role="1zAUyy">
-        <property role="TrG5h" value="node" />
-      </node>
     </node>
     <node concept="3AqmO8" id="7pxta7vmNbZ" role="8PkJo">
       <property role="TrG5h" value="used" />
@@ -6517,9 +6416,6 @@
       <node concept="1zAUYm" id="7pxta7vmNd0" role="1zAUyy">
         <property role="TrG5h" value="rsite" />
       </node>
-      <node concept="1zAUYm" id="7pxta7vmNd4" role="1zAUyy">
-        <property role="TrG5h" value="node" />
-      </node>
     </node>
     <node concept="3AqmO8" id="22$xxOvZhlA" role="8PkJo">
       <property role="TrG5h" value="used_visit" />
@@ -6576,43 +6472,57 @@
     <node concept="1nLNMY" id="6Yb9hAqNWtt" role="1nK1Vg">
       <property role="TrG5h" value="write_localVarDecl" />
       <node concept="3clFbS" id="6Yb9hAqNWtu" role="1nLNMH">
-        <node concept="3clFbJ" id="FAZzzisEoZ" role="3cqZAp">
-          <node concept="3clFbS" id="FAZzzisEp1" role="3clFbx">
-            <node concept="1nLNNL" id="FAZzzisEqj" role="3cqZAp">
-              <node concept="1nLNMm" id="FAZzzisEql" role="1nLNNK">
-                <node concept="3Aq9E8" id="FAZzzisEqp" role="1nLNMd">
-                  <node concept="3I6sU6" id="FAZzzisEqq" role="3Ip0Jz">
-                    <node concept="3I6s7M" id="FAZzzisEqu" role="3I6sU7">
-                      <node concept="3Aqt3T" id="FAZzzisEqt" role="3I6s78">
-                        <ref role="3AqCNq" node="6Yb9hAqR6c6" resolve="write" />
-                        <node concept="3BlFb$" id="FAZzzisEqz" role="3AunhB">
-                          <node concept="3A2sRY" id="FAZzzisEqD" role="3BlFb_">
+        <node concept="1nLNNL" id="FAZzzisEqj" role="3cqZAp">
+          <node concept="1nLNMm" id="FAZzzisEql" role="1nLNNK">
+            <node concept="3Aq9E8" id="2Uh$R6pCitx" role="1nLNMd">
+              <node concept="3I6sU6" id="2Uh$R6pCity" role="3Ip0Jz">
+                <node concept="3IrJb3" id="2Uh$R6pCiCX" role="3I6sU7">
+                  <node concept="3clFbS" id="2Uh$R6pCiCY" role="3IrJb0">
+                    <node concept="3Aqczg" id="2Uh$R6pCiDj" role="3cqZAp">
+                      <node concept="3Aqt3T" id="2Uh$R6pCiDh" role="3Aqpz8">
+                        <ref role="3AqCNq" node="2Uh$R6pCiqX" resolve="loc" />
+                        <node concept="3BlFb$" id="2Uh$R6pCiDu" role="3AunhB">
+                          <node concept="3A2sRY" id="2Uh$R6pCiD$" role="3BlFb_">
                             <ref role="3A2yKK" node="6Yb9hAqNWuH" resolve="lvd" />
                           </node>
                         </node>
-                        <node concept="3BlFb$" id="FAZzzisEqK" role="3AunhB">
-                          <node concept="3A2sRY" id="FAZzzisEqS" role="3BlFb_">
-                            <ref role="3A2yKK" node="6Yb9hAqNWuH" resolve="lvd" />
+                      </node>
+                    </node>
+                    <node concept="3clFbJ" id="2Uh$R6pCiDO" role="3cqZAp">
+                      <node concept="3clFbS" id="2Uh$R6pCiDQ" role="3clFbx">
+                        <node concept="3Aqczg" id="2Uh$R6pCiD2" role="3cqZAp">
+                          <node concept="3Aqt3T" id="2Uh$R6pCiD1" role="3Aqpz8">
+                            <ref role="3AqCNq" node="6Yb9hAqR6c6" resolve="write" />
+                            <node concept="3BlFb$" id="FAZzzisEqz" role="3AunhB">
+                              <node concept="3A2sRY" id="FAZzzisEqD" role="3BlFb_">
+                                <ref role="3A2yKK" node="6Yb9hAqNWuH" resolve="lvd" />
+                              </node>
+                            </node>
+                            <node concept="3BlFb$" id="FAZzzisEqK" role="3AunhB">
+                              <node concept="3A2sRY" id="FAZzzisEqS" role="3BlFb_">
+                                <ref role="3A2yKK" node="6Yb9hAqNWuH" resolve="lvd" />
+                              </node>
+                            </node>
                           </node>
                         </node>
                       </node>
+                      <node concept="2OqwBi" id="2Uh$R6pCkkh" role="3clFbw">
+                        <node concept="2OqwBi" id="2Uh$R6pCiWY" role="2Oq$k0">
+                          <node concept="3A2sRY" id="2Uh$R6pCiE7" role="2Oq$k0">
+                            <ref role="3A2yKK" node="6Yb9hAqNWuH" resolve="lvd" />
+                          </node>
+                          <node concept="3TrEf2" id="2Uh$R6pCjKs" role="2OqNvi">
+                            <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
+                          </node>
+                        </node>
+                        <node concept="3x8VRR" id="2Uh$R6pCk_8" role="2OqNvi" />
+                      </node>
                     </node>
                   </node>
                 </node>
               </node>
             </node>
           </node>
-          <node concept="2OqwBi" id="FAZzzisEq4" role="3clFbw">
-            <node concept="2OqwBi" id="FAZzzisEq5" role="2Oq$k0">
-              <node concept="3A2sRY" id="FAZzzisEq6" role="2Oq$k0">
-                <ref role="3A2yKK" node="6Yb9hAqNWuH" resolve="lvd" />
-              </node>
-              <node concept="3TrEf2" id="FAZzzisEq7" role="2OqNvi">
-                <ref role="3Tt5mk" to="tpee:fz3vP1I" resolve="initializer" />
-              </node>
-            </node>
-            <node concept="3x8VRR" id="FAZzzisEq8" role="2OqNvi" />
-          </node>
         </node>
       </node>
       <node concept="2t___k" id="6Yb9hAqNWuG" role="1nLNMg">