diff --git a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
index abd239e4..bc7f5896 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/generator/template/main@generator.mps
@@ -10864,27 +10864,6 @@
       </node>
     </node>
     <node concept="2tJIrI" id="20Ay2Vf1l6U" role="jymVt" />
-    <node concept="3clFb_" id="4MqhgXUa3oY" role="jymVt">
-      <property role="1EzhhJ" value="false" />
-      <property role="TrG5h" value="primarySymbols" />
-      <node concept="A3Dl8" id="2vGNdoJHbUP" role="3clF45">
-        <node concept="3uibUv" id="2vGNdoJHbUQ" role="A3Ik2">
-          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4MqhgXUa3p0" role="1B3o_S" />
-      <node concept="3clFbS" id="4MqhgXUa3p2" role="3clF47">
-        <node concept="3clFbF" id="34$A1Mf7Kfv" role="3cqZAp">
-          <node concept="37vLTw" id="34$A1Mf7Kfu" role="3clFbG">
-            <ref role="3cqZAo" node="2vGNdoJKThO" resolve="primarySymbols" />
-          </node>
-        </node>
-      </node>
-      <node concept="2AHcQZ" id="4MqhgXUa3p3" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4MqhgXUazcQ" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUazsM" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="ruleTemplates" />
diff --git a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
index 892005d0..aef37c55 100644
--- a/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
+++ b/coderules/languages/jetbrains.mps.lang.coderules/runtime/models/jetbrains.mps.lang.coderules.program.mps
@@ -1754,19 +1754,6 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="4MqhgXUMbbd" role="3cqZAp">
-          <node concept="37vLTI" id="4MqhgXUMbbf" role="3clFbG">
-            <node concept="2OqwBi" id="4MqhgXUMbjP" role="37vLTJ">
-              <node concept="Xjq3P" id="4MqhgXUMbkR" role="2Oq$k0" />
-              <node concept="2OwXpG" id="4MqhgXUMbjS" role="2OqNvi">
-                <ref role="2Oxat5" node="4MqhgXUMbb9" resolve="primary" />
-              </node>
-            </node>
-            <node concept="37vLTw" id="4MqhgXUMbbj" role="37vLTx">
-              <ref role="3cqZAo" node="4MqhgXUMb69" resolve="primary" />
-            </node>
-          </node>
-        </node>
         <node concept="3clFbF" id="4MqhgXUMKBn" role="3cqZAp">
           <node concept="1rXfSq" id="4MqhgXUMKBl" role="3clFbG">
             <ref role="37wK5l" node="4MqhgXUMhh_" resolve="init" />
@@ -1780,18 +1767,14 @@
         <property role="TrG5h" value="name" />
         <node concept="17QB3L" id="4MqhgXUMb4R" role="1tU5fm" />
       </node>
-      <node concept="37vLTG" id="4MqhgXUMb69" role="3clF46">
-        <property role="TrG5h" value="primary" />
-        <node concept="A3Dl8" id="2vGNdoJHq67" role="1tU5fm">
-          <node concept="3uibUv" id="2vGNdoJHq68" role="A3Ik2">
-            <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-          </node>
-        </node>
-      </node>
       <node concept="37vLTG" id="4MqhgXUMh3C" role="3clF46">
         <property role="TrG5h" value="locations" />
         <node concept="A3Dl8" id="4MqhgXUMh7W" role="1tU5fm">
-          <node concept="3qTvmN" id="4MqhgXUNZ97" role="A3Ik2" />
+          <node concept="3qUE_q" id="4$YN6QuJyMz" role="A3Ik2">
+            <node concept="3uibUv" id="4$YN6QuJyNZ" role="3qUE_r">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
         </node>
       </node>
     </node>
@@ -1907,7 +1890,11 @@
       <node concept="37vLTG" id="4MqhgXUMhtr" role="3clF46">
         <property role="TrG5h" value="locations" />
         <node concept="A3Dl8" id="4MqhgXUMhxO" role="1tU5fm">
-          <node concept="3qTvmN" id="4MqhgXUO0SD" role="A3Ik2" />
+          <node concept="3qUE_q" id="4$YN6QuKBWx" role="A3Ik2">
+            <node concept="3uibUv" id="4$YN6QuKCoF" role="3qUE_r">
+              <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="3cqZAl" id="4MqhgXUMhhB" role="3clF45" />
@@ -2012,30 +1999,6 @@
           <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
         </node>
       </node>
-      <node concept="2tJIrI" id="2vGNdoJKjpi" role="jymVt" />
-      <node concept="3clFb_" id="2vGNdoJKm_W" role="jymVt">
-        <property role="1EzhhJ" value="false" />
-        <property role="TrG5h" value="primarySymbols" />
-        <property role="DiZV1" value="false" />
-        <property role="od$2w" value="false" />
-        <node concept="3Tm1VV" id="2vGNdoJKm_X" role="1B3o_S" />
-        <node concept="3uibUv" id="2vGNdoJKm_Z" role="3clF45">
-          <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-          <node concept="3uibUv" id="2vGNdoJKmA0" role="11_B2D">
-            <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-          </node>
-        </node>
-        <node concept="3clFbS" id="2vGNdoJKmA1" role="3clF47">
-          <node concept="3clFbF" id="2vGNdoJKnKS" role="3cqZAp">
-            <node concept="37vLTw" id="2vGNdoJKnKR" role="3clFbG">
-              <ref role="3cqZAo" node="4MqhgXUMbb9" resolve="primary" />
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="2vGNdoJKmA2" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
       <node concept="2tJIrI" id="4MqhgXUM$rD" role="jymVt" />
       <node concept="3clFb_" id="4MqhgXUM$40" role="jymVt">
         <property role="1EzhhJ" value="false" />
@@ -2123,16 +2086,6 @@
       <node concept="3Tm6S6" id="4MqhgXUMb9q" role="1B3o_S" />
       <node concept="17QB3L" id="4MqhgXUMb9s" role="1tU5fm" />
     </node>
-    <node concept="312cEg" id="4MqhgXUMbb9" role="jymVt">
-      <property role="TrG5h" value="primary" />
-      <property role="3TUv4t" value="true" />
-      <node concept="3Tm6S6" id="4MqhgXUMbba" role="1B3o_S" />
-      <node concept="A3Dl8" id="2vGNdoJHqg2" role="1tU5fm">
-        <node concept="3uibUv" id="2vGNdoJHqg3" role="A3Ik2">
-          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-        </node>
-      </node>
-    </node>
     <node concept="312cEg" id="4MqhgXUMgHN" role="jymVt">
       <property role="TrG5h" value="location2rules" />
       <node concept="3Tm6S6" id="4MqhgXUMgHO" role="1B3o_S" />
@@ -2516,14 +2469,6 @@
                         <ref role="37wK5l" to="i348:4MqhgXUN1Pe" resolve="name" />
                       </node>
                     </node>
-                    <node concept="2OqwBi" id="7DvO2M9UahI" role="37wK5m">
-                      <node concept="37vLTw" id="7DvO2M9UahJ" role="2Oq$k0">
-                        <ref role="3cqZAo" node="7DvO2M9Uahq" resolve="handlerTemplate" />
-                      </node>
-                      <node concept="liA8E" id="7DvO2M9UahK" role="2OqNvi">
-                        <ref role="37wK5l" to="i348:4MqhgXU9lmo" resolve="primarySymbols" />
-                      </node>
-                    </node>
                     <node concept="2OqwBi" id="7DvO2M9UahL" role="37wK5m">
                       <node concept="37vLTw" id="7DvO2M9UahM" role="2Oq$k0">
                         <ref role="3cqZAo" node="7DvO2M9Uahq" resolve="handlerTemplate" />
@@ -2615,13 +2560,6 @@
                         <ref role="37wK5l" to="i348:6OXbTD$iO0w" resolve="name" />
                       </node>
                     </node>
-                    <node concept="2ShNRf" id="6OXbTDzvnFU" role="37wK5m">
-                      <node concept="kMnCb" id="6OXbTDzvnFV" role="2ShVmc">
-                        <node concept="3uibUv" id="6OXbTDzvnFW" role="kMuH3">
-                          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-                        </node>
-                      </node>
-                    </node>
                     <node concept="2ShNRf" id="6OXbTDzvnFX" role="37wK5m">
                       <node concept="2HTt$P" id="6OXbTDzvnFY" role="2ShVmc">
                         <node concept="3uibUv" id="6OXbTDzvnFZ" role="2HTBi0">
@@ -5390,13 +5328,6 @@
                     <node concept="Xl_RD" id="4MqhgXUQiny" role="37wK5m">
                       <property role="Xl_RC" value="finish" />
                     </node>
-                    <node concept="2ShNRf" id="2TtA2rKaiYZ" role="37wK5m">
-                      <node concept="kMnCb" id="2TtA2rKaiTa" role="2ShVmc">
-                        <node concept="3uibUv" id="2TtA2rKaiTb" role="kMuH3">
-                          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-                        </node>
-                      </node>
-                    </node>
                     <node concept="2ShNRf" id="4MqhgXUQinA" role="37wK5m">
                       <node concept="2HTt$P" id="4MqhgXUQinB" role="2ShVmc">
                         <node concept="3uibUv" id="4MqhgXUQinC" role="2HTBi0">
diff --git a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
index 64b1ddee..c68a5333 100644
--- a/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
+++ b/coderules/solutions/jetbrains.mps.lang.coderules.template/models/jetbrains.mps.lang.coderules.template.mps
@@ -947,20 +947,6 @@
       <node concept="3Tm1VV" id="7P_FdVQoGPw" role="1B3o_S" />
       <node concept="3clFbS" id="7P_FdVQoGPx" role="3clF47" />
     </node>
-    <node concept="2tJIrI" id="7P_FdVQoNeh" role="jymVt" />
-    <node concept="3clFb_" id="4MqhgXU9lmo" role="jymVt">
-      <property role="TrG5h" value="primarySymbols" />
-      <node concept="A3Dl8" id="2vGNdoJH8yh" role="3clF45">
-        <node concept="3uibUv" id="2vGNdoJH8yj" role="A3Ik2">
-          <ref role="3uigEE" to="av0y:~ConstraintSymbol" resolve="ConstraintSymbol" />
-        </node>
-      </node>
-      <node concept="3Tm1VV" id="4MqhgXU9lmr" role="1B3o_S" />
-      <node concept="3clFbS" id="4MqhgXU9lms" role="3clF47" />
-      <node concept="2AHcQZ" id="7P_FdVPH75_" role="2AJF6D">
-        <ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
-      </node>
-    </node>
     <node concept="2tJIrI" id="4MqhgXU9fJA" role="jymVt" />
     <node concept="3clFb_" id="4MqhgXUaiON" role="jymVt">
       <property role="TrG5h" value="ruleTemplates" />
@@ -3853,30 +3839,6 @@
         </node>
       </node>
       <node concept="2tJIrI" id="7eGEHDlc$eo" role="jymVt" />
-      <node concept="3clFb_" id="7eGEHDlc$ep" role="jymVt">
-        <property role="TrG5h" value="body" />
-        <property role="1EzhhJ" value="false" />
-        <node concept="3uibUv" id="7eGEHDlc$eq" role="3clF45">
-          <ref role="3uigEE" to="wyt6:~Iterable" resolve="Iterable" />
-          <node concept="3uibUv" id="5uFPQ7BHb5l" role="11_B2D">
-            <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
-          </node>
-        </node>
-        <node concept="3Tm1VV" id="7eGEHDlc$es" role="1B3o_S" />
-        <node concept="3clFbS" id="7eGEHDlc$et" role="3clF47">
-          <node concept="YS8fn" id="2_NfR5wmTaG" role="3cqZAp">
-            <node concept="2ShNRf" id="2_NfR5wmTCQ" role="YScLw">
-              <node concept="1pGfFk" id="2_NfR5wmTUa" role="2ShVmc">
-                <ref role="37wK5l" to="wyt6:~UnsupportedOperationException.&lt;init&gt;()" resolve="UnsupportedOperationException" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="2AHcQZ" id="7eGEHDldApc" role="2AJF6D">
-          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-        </node>
-      </node>
-      <node concept="2tJIrI" id="TYqmVPFZAf" role="jymVt" />
       <node concept="3clFb_" id="TYqmVPG0r5" role="jymVt">
         <property role="TrG5h" value="bodyAlternation" />
         <property role="1EzhhJ" value="false" />
@@ -4054,12 +4016,6 @@
     </node>
     <node concept="312cEg" id="7eGEHDlc$e_" role="jymVt">
       <property role="TrG5h" value="headKept" />
-      <node concept="3uibUv" id="7eGEHDlc$eB" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="1HG00HG1YdR" role="11_B2D">
-          <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
-        </node>
-      </node>
       <node concept="3Tm6S6" id="7eGEHDlc$eA" role="1B3o_S" />
       <node concept="2ShNRf" id="7eGEHDlc$eD" role="33vP2m">
         <node concept="1pGfFk" id="7eGEHDlc$eE" role="2ShVmc">
@@ -4072,15 +4028,15 @@
           </node>
         </node>
       </node>
-    </node>
-    <node concept="312cEg" id="7eGEHDlc$eH" role="jymVt">
-      <property role="TrG5h" value="headReplaced" />
-      <node concept="3uibUv" id="7eGEHDlc$eJ" role="1tU5fm">
+      <node concept="3uibUv" id="7eGEHDlc$eB" role="1tU5fm">
         <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="1HG00HG21te" role="11_B2D">
+        <node concept="3uibUv" id="1HG00HG1YdR" role="11_B2D">
           <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
         </node>
       </node>
+    </node>
+    <node concept="312cEg" id="7eGEHDlc$eH" role="jymVt">
+      <property role="TrG5h" value="headReplaced" />
       <node concept="3Tm6S6" id="7eGEHDlc$eI" role="1B3o_S" />
       <node concept="2ShNRf" id="7eGEHDlc$eL" role="33vP2m">
         <node concept="1pGfFk" id="7eGEHDlc$eM" role="2ShVmc">
@@ -4093,15 +4049,15 @@
           </node>
         </node>
       </node>
+      <node concept="3uibUv" id="7eGEHDlc$eJ" role="1tU5fm">
+        <ref role="3uigEE" to="33ny:~List" resolve="List" />
+        <node concept="3uibUv" id="1HG00HG21te" role="11_B2D">
+          <ref role="3uigEE" to="av0y:~Constraint" resolve="Constraint" />
+        </node>
+      </node>
     </node>
     <node concept="312cEg" id="7eGEHDlc$eP" role="jymVt">
       <property role="TrG5h" value="guard" />
-      <node concept="3uibUv" id="7eGEHDlc$eR" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="5uFPQ7BH7BV" role="11_B2D">
-          <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
-        </node>
-      </node>
       <node concept="3Tm6S6" id="7eGEHDlc$eQ" role="1B3o_S" />
       <node concept="2ShNRf" id="7eGEHDlc$eT" role="33vP2m">
         <node concept="1pGfFk" id="7eGEHDlc$eU" role="2ShVmc">
@@ -4114,30 +4070,36 @@
           </node>
         </node>
       </node>
+      <node concept="3uibUv" id="7eGEHDlc$eR" role="1tU5fm">
+        <ref role="3uigEE" to="33ny:~List" resolve="List" />
+        <node concept="3uibUv" id="5uFPQ7BH7BV" role="11_B2D">
+          <ref role="3uigEE" to="av0y:~Predicate" resolve="Predicate" />
+        </node>
+      </node>
     </node>
     <node concept="312cEg" id="7eGEHDlc$eX" role="jymVt">
       <property role="TrG5h" value="bodyAlternation" />
-      <node concept="3uibUv" id="7eGEHDlc$eZ" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~List" resolve="List" />
-        <node concept="3uibUv" id="2_NfR5wkbAi" role="11_B2D">
-          <ref role="3uigEE" to="33ny:~List" resolve="List" />
-          <node concept="3uibUv" id="2_NfR5wkcfq" role="11_B2D">
-            <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
-          </node>
-        </node>
-      </node>
       <node concept="3Tm6S6" id="7eGEHDlc$eY" role="1B3o_S" />
       <node concept="2ShNRf" id="7eGEHDlc$f1" role="33vP2m">
         <node concept="1pGfFk" id="7eGEHDlc$f2" role="2ShVmc">
           <ref role="37wK5l" to="33ny:~ArrayList.&lt;init&gt;(int)" resolve="ArrayList" />
+          <node concept="3cmrfG" id="2_NfR5wkrqS" role="37wK5m">
+            <property role="3cmrfH" value="2" />
+          </node>
           <node concept="3uibUv" id="2_NfR5wkjUe" role="1pMfVU">
             <ref role="3uigEE" to="33ny:~List" resolve="List" />
             <node concept="3uibUv" id="2_NfR5wkkDv" role="11_B2D">
               <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
             </node>
           </node>
-          <node concept="3cmrfG" id="2_NfR5wkrqS" role="37wK5m">
-            <property role="3cmrfH" value="2" />
+        </node>
+      </node>
+      <node concept="3uibUv" id="7eGEHDlc$eZ" role="1tU5fm">
+        <ref role="3uigEE" to="33ny:~List" resolve="List" />
+        <node concept="3uibUv" id="2_NfR5wkbAi" role="11_B2D">
+          <ref role="3uigEE" to="33ny:~List" resolve="List" />
+          <node concept="3uibUv" id="2_NfR5wkcfq" role="11_B2D">
+            <ref role="3uigEE" to="av0y:~AndItem" resolve="AndItem" />
           </node>
         </node>
       </node>