diff --git a/topics/java/lci/java-lci.csproj b/topics/java/lci/java-lci.csproj
index d93f361b..f7bf3042 100644
--- a/topics/java/lci/java-lci.csproj
+++ b/topics/java/lci/java-lci.csproj
@@ -58,19 +58,22 @@
     <None Include="xbgf\correct-doc1.xbgf" />
     <None Include="xbgf\correct-doc2.xbgf" />
     <None Include="xbgf\correct-doc3.xbgf" />
-    <None Include="xbgf\deyaccify-doc2.xbgf" />
+    <None Include="xbgf\deyaccifyStatements.xbgf" />
     <None Include="xbgf\edit-doc1.xbgf" />
     <None Include="xbgf\edit-doc2.xbgf" />
     <None Include="xbgf\edit-doc3.xbgf" />
     <None Include="xbgf\editDeclarations.xbgf" />
+    <None Include="xbgf\editExpressions-doc2.xbgf" />
+    <None Include="xbgf\editExpressions-doc3.xbgf" />
     <None Include="xbgf\editExpressions-jls1.xbgf" />
-    <None Include="xbgf\editExpressions.xbgf" />
     <None Include="xbgf\eliminate-doc2.xbgf" />
     <None Include="xbgf\extend-doc1.xbgf" />
     <None Include="xbgf\extend-doc12.xbgf" />
     <None Include="xbgf\extend-jls1.xbgf" />
-    <None Include="xbgf\extend-jls2.xbgf" />
+    <None Include="xbgf\extendDeclarations.xbgf" />
+    <None Include="xbgf\extendExpressions.xbgf" />
     <None Include="xbgf\extendModifiers.xbgf" />
+    <None Include="xbgf\extendStatements.xbgf" />
     <None Include="xbgf\generalize-app3.xbgf" />
     <None Include="xbgf\generalizeBlock.xbgf" />
     <None Include="xbgf\generalizeLabels.xbgf" />
@@ -79,7 +82,6 @@
     <None Include="xbgf\generalizeNames-doc1.xbgf" />
     <None Include="xbgf\generalizeNames.xbgf" />
     <None Include="xbgf\generalizeStatements.xbgf" />
-    <None Include="xbgf\inline-jls2.xbgf" />
     <None Include="xbgf\inlineStatements.xbgf" />
     <None Include="xbgf\recover-app3.xbgf" />
     <None Include="xbgf\recover-doc2.xbgf" />
diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf
index 95d9d9ac..80f0f022 100644
--- a/topics/java/lci/java.lcf
+++ b/topics/java/lci/java.lcf
@@ -122,7 +122,7 @@
       <perform>refactorExpressions</perform>
       <perform>inlineStatements</perform>
       <perform>generalizeStatements</perform>
-      <perform>editExpressions</perform>
+      <perform>editExpressions-doc2</perform>
       <perform>eliminate-doc2</perform>
       <perform>refactorClasses-doc2</perform>
       <perform>refactorInterfaces-doc2</perform>
diff --git a/topics/java/lci/xbgf/correct-app2.xbgf b/topics/java/lci/xbgf/correct-app2.xbgf
index 91dcaa50..9476d496 100644
--- a/topics/java/lci/xbgf/correct-app2.xbgf
+++ b/topics/java/lci/xbgf/correct-app2.xbgf
@@ -43,29 +43,9 @@
 
   <!-- ISSUE CORRECT SPECERROR
   let's complete some of the statements with a trailing semicolon-->
-  <xbgf:designate>
-    <bgf:production>
-      <label>ContinueStatement</label>
-      <nonterminal>Statement</nonterminal>        <bgf:expression>
-          <sequence>
-            <bgf:expression>
-              <terminal>continue</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <optional>
-                <bgf:expression>
-                  <nonterminal>Identifier</nonterminal>
-                </bgf:expression>
-              </optional>
-            </bgf:expression>
-          </sequence>
-        </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <!-- REVISE -->
   <xbgf:inject>
     <bgf:production>
-      <label>ContinueStatement</label>
       <nonterminal>Statement</nonterminal>
       <bgf:expression>
         <sequence>
@@ -90,36 +70,12 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:inject>
-  <xbgf:unlabel>
-    <label>ContinueStatement</label>
-  </xbgf:unlabel>
   
   <!-- ISSUE CORRECT SPECERROR
   Same for BreakStatement -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>BreakStatement</label>
-      <nonterminal>Statement</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>break</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>Identifier</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <!-- REVISE -->
   <xbgf:inject>
     <bgf:production>
-      <label>BreakStatement</label>
       <nonterminal>Statement</nonterminal>
       <bgf:expression>
         <sequence>
@@ -144,9 +100,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:inject>
-  <xbgf:unlabel>
-    <label>BreakStatement</label>
-  </xbgf:unlabel>
 
   <!-- ISSUE CORRECT SPECERROR
   Expression is referenced as Expr:
diff --git a/topics/java/lci/xbgf/editDeclarations.xbgf b/topics/java/lci/xbgf/editDeclarations.xbgf
index e65e1290..6df5e90e 100644
--- a/topics/java/lci/xbgf/editDeclarations.xbgf
+++ b/topics/java/lci/xbgf/editDeclarations.xbgf
@@ -1596,51 +1596,8 @@
       <nonterminal>ClassBodyDeclaration</nonterminal>
     </in>
   </xbgf:unfold>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>ClassBodyDeclaration</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>ModifiersOpt</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Type</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Identifier</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>VariableDeclaratorRest</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <star>
-              <bgf:expression>
-                <sequence>
-                  <bgf:expression>
-                    <terminal>,</terminal>
-                  </bgf:expression>
-                  <bgf:expression>
-                    <nonterminal>Identifier</nonterminal>
-                  </bgf:expression>
-                  <bgf:expression>
-                    <nonterminal>VariableDeclaratorRest</nonterminal>
-                  </bgf:expression>
-                </sequence>
-              </bgf:expression>
-            </star>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>;</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:disappear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>ClassBodyDeclaration</nonterminal>
       <bgf:expression>
         <sequence>
@@ -1687,7 +1644,6 @@
   <!-- REVISE -->
   <xbgf:project>
     <bgf:production>
-      <label>target</label>
       <nonterminal>ClassBodyDeclaration</nonterminal>
       <bgf:expression>
         <sequence>
@@ -1714,9 +1670,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:project>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
 
   <!-- 
       - [], ,([n(ModifiersOpt), n(Type), n(Identifier), n(MethodDeclaratorRest)])
diff --git a/topics/java/lci/xbgf/editExpressions.xbgf b/topics/java/lci/xbgf/editExpressions-doc2.xbgf
similarity index 89%
rename from topics/java/lci/xbgf/editExpressions.xbgf
rename to topics/java/lci/xbgf/editExpressions-doc2.xbgf
index a83e74ce..45893183 100644
--- a/topics/java/lci/xbgf/editExpressions.xbgf
+++ b/topics/java/lci/xbgf/editExpressions-doc2.xbgf
@@ -46,24 +46,14 @@
     <nonterminal>Primary</nonterminal>
   </xbgf:vertical>
 
-  <!-- 
+  <!-- ISSUE EXTEND
    - Fail: Primary.
       - [], ,([t(this), ?(n(Arguments))])
      vs.
       - [], t(this)
   -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>Primary</nonterminal>
-      <bgf:expression>
-        <terminal>this</terminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>Primary</nonterminal>
       <bgf:expression>
         <sequence>
@@ -85,9 +75,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
 
   <!-- ISSUE PERMISSIVENESS
    - Fail: Primary.
@@ -95,14 +82,17 @@
      vs.
       - [], ,([n(Type), t(.), t(class)])
   -->
-  <xbgf:designate>
+  <xbgf:downgrade>
     <bgf:production>
-      <label>target</label>
       <nonterminal>Primary</nonterminal>
       <bgf:expression>
         <sequence>
           <bgf:expression>
-            <nonterminal>Type</nonterminal>
+            <marked>
+              <bgf:expression>
+                <nonterminal>Type</nonterminal>
+              </bgf:expression>
+            </marked>
           </bgf:expression>
           <bgf:expression>
             <terminal>.</terminal>
@@ -113,29 +103,55 @@
         </sequence>
       </bgf:expression>
     </bgf:production>
-  </xbgf:designate>
-  <!-- GENERALITY -->
-  <xbgf:replace>
-    <bgf:expression>
+    <bgf:production>
       <nonterminal>Type</nonterminal>
-    </bgf:expression>
-    <bgf:expression>
-      <sequence>
-        <bgf:expression>
-          <nonterminal>BasicType</nonterminal>
-        </bgf:expression>
-        <bgf:expression>
-          <nonterminal>BracketsOpt</nonterminal>
-        </bgf:expression>
-      </sequence>
-    </bgf:expression>
+      <bgf:expression>
+        <nonterminal>BasicType</nonterminal>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:downgrade>
+  <xbgf:appear>
+    <bgf:production>
+      <nonterminal>Primary</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <nonterminal>BasicType</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <marked>
+              <bgf:expression>
+                <star>
+                  <bgf:expression>
+                    <sequence>
+                      <bgf:expression>
+                        <terminal>[</terminal>
+                      </bgf:expression>
+                      <bgf:expression>
+                        <terminal>]</terminal>
+                      </bgf:expression>
+                    </sequence>
+                  </bgf:expression>
+                </star>
+              </bgf:expression>
+            </marked>
+          </bgf:expression>
+          <bgf:expression>
+            <terminal>.</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <terminal>class</terminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:appear>
+  <xbgf:fold>
+    <nonterminal>BracketsOpt</nonterminal>
     <in>
-      <label>target</label>
+      <nonterminal>Primary</nonterminal>
     </in>
-  </xbgf:replace>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
+  </xbgf:fold>
 
   <!--  
    - Fail: Primary.
diff --git a/topics/java/lci/xbgf/editExpressions-doc3.xbgf b/topics/java/lci/xbgf/editExpressions-doc3.xbgf
index 15e0c71d..784d05bb 100644
--- a/topics/java/lci/xbgf/editExpressions-doc3.xbgf
+++ b/topics/java/lci/xbgf/editExpressions-doc3.xbgf
@@ -52,18 +52,8 @@
      vs.
       - [], t(this)
   -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>Primary</nonterminal>
-      <bgf:expression>
-        <terminal>this</terminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>Primary</nonterminal>
       <bgf:expression>
         <sequence>
@@ -85,9 +75,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
 
   <!-- ISSUE PERMISSIVENESS
    - Fail: Primary.
@@ -95,14 +82,17 @@
      vs.
       - [], ,([n(Type), t(.), t(class)])
   -->
-  <xbgf:designate>
+  <xbgf:downgrade>
     <bgf:production>
-      <label>target</label>
       <nonterminal>Primary</nonterminal>
       <bgf:expression>
         <sequence>
           <bgf:expression>
-            <nonterminal>Type</nonterminal>
+            <marked>
+              <bgf:expression>
+                <nonterminal>Type</nonterminal>
+              </bgf:expression>
+            </marked>
           </bgf:expression>
           <bgf:expression>
             <terminal>.</terminal>
@@ -113,30 +103,56 @@
         </sequence>
       </bgf:expression>
     </bgf:production>
-  </xbgf:designate>
-  <!-- GENERALITY -->
-  <xbgf:replace>
-    <bgf:expression>
+    <bgf:production>
       <nonterminal>Type</nonterminal>
-    </bgf:expression>
-    <bgf:expression>
-      <sequence>
-        <bgf:expression>
-          <nonterminal>BasicType</nonterminal>
-        </bgf:expression>
-        <bgf:expression>
-          <nonterminal>BracketsOpt</nonterminal>
-        </bgf:expression>
-      </sequence>
-    </bgf:expression>
+      <bgf:expression>
+        <nonterminal>BasicType</nonterminal>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:downgrade>
+  <xbgf:appear>
+    <bgf:production>
+      <nonterminal>Primary</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <nonterminal>BasicType</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <marked>
+              <bgf:expression>
+                <star>
+                  <bgf:expression>
+                    <sequence>
+                      <bgf:expression>
+                        <terminal>[</terminal>
+                      </bgf:expression>
+                      <bgf:expression>
+                        <terminal>]</terminal>
+                      </bgf:expression>
+                    </sequence>
+                  </bgf:expression>
+                </star>
+              </bgf:expression>
+            </marked>
+          </bgf:expression>
+          <bgf:expression>
+            <terminal>.</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <terminal>class</terminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:appear>
+  <xbgf:fold>
+    <nonterminal>BracketsOpt</nonterminal>
     <in>
-      <label>target</label>
+      <nonterminal>Primary</nonterminal>
     </in>
-  </xbgf:replace>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
-
+  </xbgf:fold>
+  
   <!--  
    - Fail: Primary.
       - [], ,([t(new), n(Creator)])
diff --git a/topics/java/lci/xbgf/editExpressions-jls1.xbgf b/topics/java/lci/xbgf/editExpressions-jls1.xbgf
index 359b206d..e1b209af 100644
--- a/topics/java/lci/xbgf/editExpressions-jls1.xbgf
+++ b/topics/java/lci/xbgf/editExpressions-jls1.xbgf
@@ -205,50 +205,7 @@
     <nonterminal>Primary</nonterminal>
   </xbgf:vertical>
 
-  <!-- ISSUE EXTEND 
-   - Fail: Primary.
-      - [], t(this)
-     vs.
-      - [], ,([t(this), ?(n(Arguments))])
-  -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>Primary</nonterminal>
-      <bgf:expression>
-        <terminal>this</terminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:appear>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>Primary</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>this</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <marked>
-              <bgf:expression>
-                <optional>
-                  <bgf:expression>
-                    <nonterminal>Arguments</nonterminal>
-                  </bgf:expression>
-                </optional>
-              </bgf:expression>
-            </marked>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
-
-  <!-- 
+ <!-- 
   too hard to match:
         - [], n(ArrayAccess)
   -->
@@ -267,22 +224,6 @@
      vs.
       - [], ,([n(QualifiedIdentifier), ?(n(IdentifierSuffix))])
   -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>Primary</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>QualifiedIdentifier</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Arguments</nonterminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:extract>
     <bgf:production>
       <nonterminal>IdentifierSuffix</nonterminal>
@@ -291,7 +232,7 @@
       </bgf:expression>
     </bgf:production>
     <in>
-      <label>target</label>
+      <nonterminal>Primary</nonterminal>
     </in>
   </xbgf:extract>
   <xbgf:widen>
@@ -306,12 +247,9 @@
       </optional>
     </bgf:expression>
     <in>
-      <label>target</label>
+      <nonterminal>Primary</nonterminal>
     </in>
   </xbgf:widen>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
 
   <!-- ISSUE EXTEND BRUTAL
   same problem -->
@@ -327,7 +265,11 @@
             <nonterminal>QualifiedIdentifier</nonterminal>
           </bgf:expression>
           <bgf:expression>
-            <nonterminal>Arguments</nonterminal>
+            <optional>
+              <bgf:expression>
+                <nonterminal>IdentifierSuffix</nonterminal>
+              </bgf:expression>
+            </optional>
           </bgf:expression>
         </sequence>
       </bgf:expression>
@@ -565,7 +507,11 @@
             <nonterminal>Identifier</nonterminal>
           </bgf:expression>
           <bgf:expression>
-            <nonterminal>Arguments</nonterminal>
+            <optional>
+              <bgf:expression>
+                <nonterminal>IdentifierSuffix</nonterminal>
+              </bgf:expression>
+            </optional>
           </bgf:expression>
         </sequence>
       </bgf:expression>
@@ -594,4 +540,34 @@
     <nonterminal>ParExpression</nonterminal>
   </xbgf:fold>
 
+  <!-- ISSUE EXTEND 
+   - Fail: Primary.
+      - [], t(this)
+     vs.
+      - [], ,([t(this), ?(n(Arguments))])
+  -->
+  <xbgf:appear>
+    <bgf:production>
+      <nonterminal>Primary</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <terminal>this</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <marked>
+              <bgf:expression>
+                <optional>
+                  <bgf:expression>
+                    <nonterminal>Arguments</nonterminal>
+                  </bgf:expression>
+                </optional>
+              </bgf:expression>
+            </marked>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:appear>
+
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/extend-doc12.xbgf b/topics/java/lci/xbgf/extend-doc12.xbgf
index 25580269..69e37949 100644
--- a/topics/java/lci/xbgf/extend-doc12.xbgf
+++ b/topics/java/lci/xbgf/extend-doc12.xbgf
@@ -958,41 +958,8 @@
                ,([n(ClassName), t(.), t(super), t(.), ?(n(NonWildTypeArguments)), n(Identifier), t((), ?(n(ArgumentList)), t())]),
                ,([n(TypeName), t(.), n(NonWildTypeArguments), n(Identifier), t((), ?(n(ArgumentList)), t())])])
   -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>target2</label>
-      <nonterminal>MethodInvocation</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>Primary</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Identifier</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>(</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>ArgumentList</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>)</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target2</label>
       <nonterminal>MethodInvocation</nonterminal>
       <bgf:expression>
         <sequence>
@@ -1033,41 +1000,8 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target3</label>
-      <nonterminal>MethodInvocation</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>super</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Identifier</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>(</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>ArgumentList</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>)</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target3</label>
       <nonterminal>MethodInvocation</nonterminal>
       <bgf:expression>
         <sequence>
@@ -1108,47 +1042,8 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target4</label>
-      <nonterminal>MethodInvocation</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>ClassName</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>super</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Identifier</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>(</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>ArgumentList</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>)</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target4</label>
       <nonterminal>MethodInvocation</nonterminal>
       <bgf:expression>
         <sequence>
@@ -1229,15 +1124,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:add>
-  <xbgf:unlabel>
-    <label>target2</label>
-  </xbgf:unlabel>
-  <xbgf:unlabel>
-    <label>target3</label>
-  </xbgf:unlabel>
-  <xbgf:unlabel>
-    <label>target4</label>
-  </xbgf:unlabel>
 
   <!-- ISSUE EXTEND GENERALIZE
      - Fail: ConstructorDeclarator.
@@ -1674,38 +1560,8 @@
                ,([?(n(NonWildTypeArguments)), t(super), t((), ?(n(ArgumentList)), t()), t((;))]),
                ,([n(Primary), t(.), ?(n(NonWildTypeArguments)), t(super), t((), ?(n(ArgumentList)), t()), t((;))])])
   -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>target1</label>
-      <nonterminal>ExplicitConstructorInvocation</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>this</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>(</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>ArgumentList</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>)</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>;</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target1</label>
       <nonterminal>ExplicitConstructorInvocation</nonterminal>
       <bgf:expression>
         <sequence>
@@ -1743,38 +1599,8 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target2</label>
-      <nonterminal>ExplicitConstructorInvocation</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>super</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>(</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>ArgumentList</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>)</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>;</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target2</label>
       <nonterminal>ExplicitConstructorInvocation</nonterminal>
       <bgf:expression>
         <sequence>
@@ -1812,41 +1638,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target3</label>
-      <nonterminal>ExplicitConstructorInvocation</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>Primary</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>super</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>(</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>ArgumentList</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>)</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>;</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:introduce>
     <bgf:production>
       <nonterminal>ReferenceTypeList</nonterminal>
@@ -1893,7 +1684,6 @@
   </xbgf:define>
   <xbgf:appear>
     <bgf:production>
-      <label>target3</label>
       <nonterminal>ExplicitConstructorInvocation</nonterminal>
       <bgf:expression>
         <sequence>
@@ -1937,15 +1727,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target1</label>
-  </xbgf:unlabel>
-  <xbgf:unlabel>
-    <label>target2</label>
-  </xbgf:unlabel>
-  <xbgf:unlabel>
-    <label>target3</label>
-  </xbgf:unlabel>
 
   <!-- ISSUE EXTEND GENERALIZE
      - Fail: ClassInstanceCreationExpression.
@@ -1955,87 +1736,8 @@
       - [], ;([,([t(new), ?(n(TypeArguments)), n(ClassOrInterfaceType), t((), ?(n(ArgumentList)), t()), ?(n(ClassBody))]),
                ,([n(Primary), t(.), t(new), ?(n(TypeArguments)), n(Identifier), ?(n(TypeArguments)), t((), ?(n(ArgumentList)), t()), ?(n(ClassBody))])])
   -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>target1</label>
-      <nonterminal>ClassInstanceCreationExpression</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>new</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>ClassOrInterfaceType</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>(</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>ArgumentList</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>)</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>ClassBody</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target2</label>
-      <nonterminal>ClassInstanceCreationExpression</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>Primary</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>new</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Identifier</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>(</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>ArgumentList</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>)</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <nonterminal>ClassBody</nonterminal>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target1</label>
       <nonterminal>ClassInstanceCreationExpression</nonterminal>
       <bgf:expression>
         <sequence>
@@ -2082,7 +1784,6 @@
   </xbgf:appear>
   <xbgf:appear>
     <bgf:production>
-      <label>target2</label>
       <nonterminal>ClassInstanceCreationExpression</nonterminal>
       <bgf:expression>
         <sequence>
@@ -2135,7 +1836,6 @@
   </xbgf:appear>
   <xbgf:appear>
     <bgf:production>
-      <label>target2</label>
       <nonterminal>ClassInstanceCreationExpression</nonterminal>
       <bgf:expression>
         <sequence>
@@ -2193,12 +1893,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target1</label>
-  </xbgf:unlabel>
-  <xbgf:unlabel>
-    <label>target2</label>
-  </xbgf:unlabel>
 
   <!-- 
      - Fail: ArrayCreationExpression.
diff --git a/topics/java/lci/xbgf/inlineStatements.xbgf b/topics/java/lci/xbgf/inlineStatements.xbgf
index 48dc35d9..3b3c79f3 100644
--- a/topics/java/lci/xbgf/inlineStatements.xbgf
+++ b/topics/java/lci/xbgf/inlineStatements.xbgf
@@ -257,18 +257,8 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:add>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>BlockStatement</nonterminal>
-      <bgf:expression>
-        <nonterminal>Statement</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>BlockStatement</nonterminal>
       <bgf:expression>
         <sequence>
@@ -297,9 +287,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
   
   <!-- 
    - Fail: LocalVariableDeclarationStatement.
diff --git a/topics/java/lci/xbgf/refactorClasses-doc2.xbgf b/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
index 08bdb38c..70e98ddd 100644
--- a/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
@@ -434,18 +434,8 @@
   </xbgf:add>
 
   <!-- modifiers -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>ClassBodyDeclaration</nonterminal>
-      <bgf:expression>
-        <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>ClassBodyDeclaration</nonterminal>
       <bgf:expression>
         <sequence>
@@ -467,9 +457,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
   <xbgf:fold>
     <nonterminal>ModifiersOpt</nonterminal>
   </xbgf:fold>
diff --git a/topics/java/lci/xbgf/refactorClasses-doc3.xbgf b/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
index 459e6db7..f63e30bc 100644
--- a/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
@@ -183,18 +183,8 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:disappear>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>ClassMemberDeclaration</nonterminal>
-      <bgf:expression>
-        <nonterminal>ClassDeclaration</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>ClassMemberDeclaration</nonterminal>
       <bgf:expression>
         <sequence>
@@ -216,21 +206,8 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>ClassMemberDeclaration</nonterminal>
-      <bgf:expression>
-        <nonterminal>InterfaceDeclaration</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>ClassMemberDeclaration</nonterminal>
       <bgf:expression>
         <sequence>
@@ -252,9 +229,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
   <xbgf:horizontal>ClassMemberDeclaration</xbgf:horizontal>
   <xbgf:fold>
     <nonterminal>ModifiersOpt</nonterminal>
diff --git a/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf b/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf
index 9832c301..5ec334aa 100644
--- a/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf
@@ -206,18 +206,8 @@
   <xbgf:inline>AbstractMethodDeclaration</xbgf:inline>
 
   <!-- modifiers -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>InterfaceBodyDeclaration</nonterminal>
-      <bgf:expression>
-        <nonterminal>ClassDeclaration</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>InterfaceBodyDeclaration</nonterminal>
       <bgf:expression>
         <sequence>
@@ -239,21 +229,8 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>InterfaceBodyDeclaration</nonterminal>
-      <bgf:expression>
-        <nonterminal>InterfaceDeclaration</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>InterfaceBodyDeclaration</nonterminal>
       <bgf:expression>
         <sequence>
@@ -275,9 +252,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
   <xbgf:fold>
     <nonterminal>ModifiersOpt</nonterminal>
   </xbgf:fold>
diff --git a/topics/java/lci/xbgf/refactorStatements-jls1.xbgf b/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
index 94f24fea..f6983812 100644
--- a/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
+++ b/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
@@ -338,18 +338,8 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:add>
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>BlockStatement</nonterminal>
-      <bgf:expression>
-        <nonterminal>Statement</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>BlockStatement</nonterminal>
       <bgf:expression>
         <sequence>
@@ -378,9 +368,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
 
   <!-- 
    - Fail: ForUpdate.
diff --git a/topics/java/lci/xbgf/refactorTypes-jls1.xbgf b/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
index 7b7a4eb2..a43bff47 100644
--- a/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
@@ -123,18 +123,8 @@
      vs.
       - [], ;([,([n(QualifiedIdentifier), n(BracketsOpt)]), n(BasicType)])
   -->
-  <xbgf:designate>
-    <bgf:production>
-      <label>target</label>
-      <nonterminal>Type</nonterminal>
-      <bgf:expression>
-        <nonterminal>QualifiedIdentifier</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:designate>
   <xbgf:appear>
     <bgf:production>
-      <label>target</label>
       <nonterminal>Type</nonterminal>
       <bgf:expression>
         <sequence>
@@ -166,11 +156,8 @@
   <xbgf:fold>
     <nonterminal>BracketsOpt</nonterminal>
     <in>
-      <label>target</label>
+      <nonterminal>Type</nonterminal>
     </in>
   </xbgf:fold>
-  <xbgf:unlabel>
-    <label>target</label>
-  </xbgf:unlabel>
 
 </xbgf:sequence>
\ No newline at end of file