diff --git a/topics/java/lci/xbgf/correct-app2.xbgf b/topics/java/lci/xbgf/correct-app2.xbgf
index 9476d496..c261d2bb 100644
--- a/topics/java/lci/xbgf/correct-app2.xbgf
+++ b/topics/java/lci/xbgf/correct-app2.xbgf
@@ -43,7 +43,6 @@
 
   <!-- ISSUE CORRECT SPECERROR
   let's complete some of the statements with a trailing semicolon-->
-  <!-- REVISE -->
   <xbgf:inject>
     <bgf:production>
       <nonterminal>Statement</nonterminal>
@@ -73,7 +72,6 @@
   
   <!-- ISSUE CORRECT SPECERROR
   Same for BreakStatement -->
-  <!-- REVISE -->
   <xbgf:inject>
     <bgf:production>
       <nonterminal>Statement</nonterminal>
@@ -216,7 +214,6 @@
      vs.
       - [], ;([*(,([n(InfixOp), n(Expression3)])), ,([n(Expression3), t(instanceof), n(Type)])])
   -->
-  <!-- REVISE -->
   <xbgf:project>
     <bgf:production>
       <nonterminal>Expression2Rest</nonterminal>
diff --git a/topics/java/lci/xbgf/correct-app3.xbgf b/topics/java/lci/xbgf/correct-app3.xbgf
index 443ab47a..f5dd9d06 100644
--- a/topics/java/lci/xbgf/correct-app3.xbgf
+++ b/topics/java/lci/xbgf/correct-app3.xbgf
@@ -25,7 +25,6 @@ Annotation:
      vs.
       - [], ;([*(,([n(InfixOp), n(Expression3)])), ,([n(Expression3), t(instanceof), n(Type)])])
   -->
-  <!-- REVISE -->
   <xbgf:project>
     <bgf:production>
       <nonterminal>Expression2Rest</nonterminal>
@@ -80,7 +79,6 @@ Annotation:
       - [], ;([n(Block),
                ,([t(break), ?(n(Identifier)), t((;))]),
   -->
-  <!-- REVISE -->
   <xbgf:inject>
     <bgf:production>
       <nonterminal>Statement</nonterminal>
@@ -110,7 +108,6 @@ Annotation:
   
   <!--   ISSUE CORRECT SPECERROR
          same with continue -->
-  <!-- REVISE -->
   <xbgf:inject>
     <bgf:production>
       <nonterminal>Statement</nonterminal>
@@ -146,7 +143,6 @@ Annotation:
   ElementValues:
         ElementValue [ "," ElementValues ]
   -->
-  <!-- REVISE -->
   <xbgf:concretize>
     <bgf:production>
       <nonterminal>ElementValues</nonterminal>
@@ -196,7 +192,6 @@ AnnotationMethodRest:
 AnnotationConstantRest:
         VariableDeclarators
   -->
-  <!-- REVISE -->
   <xbgf:project>
     <bgf:production>
       <nonterminal>AnnotationTypeElementRest</nonterminal>
@@ -222,7 +217,6 @@ AnnotationConstantRest:
       </bgf:expression>
     </bgf:production>
   </xbgf:project>
-  <!-- REVISE -->
   <xbgf:inject>
     <bgf:production>
       <nonterminal>AnnotationMethodOrConstantRest</nonterminal>
diff --git a/topics/java/lci/xbgf/editDeclarations.xbgf b/topics/java/lci/xbgf/editDeclarations.xbgf
index 3026ccda..b132145b 100644
--- a/topics/java/lci/xbgf/editDeclarations.xbgf
+++ b/topics/java/lci/xbgf/editDeclarations.xbgf
@@ -1942,7 +1942,6 @@ Block:
       </bgf:expression>
     </bgf:production>
   </xbgf:disappear>
-  <!-- REVISE -->
   <xbgf:project>
     <bgf:production>
       <nonterminal>ClassBodyDeclaration</nonterminal>
diff --git a/topics/java/lci/xbgf/editExpressions-doc3.xbgf b/topics/java/lci/xbgf/editExpressions-doc3.xbgf
index 96022a16..f64ee8dd 100644
--- a/topics/java/lci/xbgf/editExpressions-doc3.xbgf
+++ b/topics/java/lci/xbgf/editExpressions-doc3.xbgf
@@ -490,7 +490,7 @@
     </vertical>
   </xbgf:add>
   <xbgf:add>
-    <vertical>
+    <horizontal>
       <bgf:production>
         <nonterminal>IdentifierSuffix</nonterminal>
         <bgf:expression>
@@ -499,15 +499,26 @@
               <terminal>.</terminal>
             </bgf:expression>
             <bgf:expression>
-              <terminal>class</terminal>
+              <choice>
+                <bgf:expression>
+                  <marked>
+                    <bgf:expression>
+                      <terminal>class</terminal>
+                    </bgf:expression>
+                  </marked>
+                </bgf:expression>
+                <bgf:expression>
+                  <terminal>this</terminal>
+                </bgf:expression>
+              </choice>
             </bgf:expression>
           </sequence>
         </bgf:expression>
       </bgf:production>
-    </vertical>
+    </horizontal>
   </xbgf:add>
   <xbgf:add>
-    <vertical>
+    <horizontal>
       <bgf:production>
         <nonterminal>IdentifierSuffix</nonterminal>
         <bgf:expression>
@@ -516,15 +527,33 @@
               <terminal>.</terminal>
             </bgf:expression>
             <bgf:expression>
-              <terminal>super</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <nonterminal>Arguments</nonterminal>
+              <choice>
+                <bgf:expression>
+                  <marked>
+                    <bgf:expression>
+                      <sequence>
+                        <bgf:expression>
+                          <terminal>super</terminal>
+                        </bgf:expression>
+                        <bgf:expression>
+                          <nonterminal>Arguments</nonterminal>
+                        </bgf:expression>
+                      </sequence>
+                    </bgf:expression>
+                  </marked>
+                </bgf:expression>
+                <bgf:expression>
+                  <terminal>class</terminal>
+                </bgf:expression>
+                <bgf:expression>
+                  <terminal>this</terminal>
+                </bgf:expression>
+              </choice>
             </bgf:expression>
           </sequence>
         </bgf:expression>
       </bgf:production>
-    </vertical>
+    </horizontal>
   </xbgf:add>
   <xbgf:introduce>
     <bgf:production>
@@ -542,7 +571,7 @@
     </bgf:production>
   </xbgf:introduce>
   <xbgf:add>
-    <vertical>
+    <horizontal>
       <bgf:production>
         <nonterminal>IdentifierSuffix</nonterminal>
         <bgf:expression>
@@ -551,109 +580,44 @@
               <terminal>.</terminal>
             </bgf:expression>
             <bgf:expression>
-              <terminal>new</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <nonterminal>InnerCreator</nonterminal>
-            </bgf:expression>
-          </sequence>
-        </bgf:expression>
-      </bgf:production>
-    </vertical>
-  </xbgf:add>
-  <xbgf:horizontal>IdentifierSuffix</xbgf:horizontal>
-  <xbgf:factor>
-    <bgf:expression>
-      <choice>
-        <bgf:expression>
-          <sequence>
-            <bgf:expression>
-              <terminal>.</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <terminal>this</terminal>
-            </bgf:expression>
-          </sequence>
-        </bgf:expression>
-        <bgf:expression>
-          <sequence>
-            <bgf:expression>
-              <terminal>.</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <terminal>class</terminal>
-            </bgf:expression>
-          </sequence>
-        </bgf:expression>
-        <bgf:expression>
-          <sequence>
-            <bgf:expression>
-              <terminal>.</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <terminal>super</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <nonterminal>Arguments</nonterminal>
-            </bgf:expression>
-          </sequence>
-        </bgf:expression>
-        <bgf:expression>
-          <sequence>
-            <bgf:expression>
-              <terminal>.</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <terminal>new</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <nonterminal>InnerCreator</nonterminal>
-            </bgf:expression>
-          </sequence>
-        </bgf:expression>
-      </choice>
-    </bgf:expression>
-    <bgf:expression>
-      <sequence>
-        <bgf:expression>
-          <terminal>.</terminal>
-        </bgf:expression>
-        <bgf:expression>
-          <choice>
-            <bgf:expression>
-              <terminal>class</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <terminal>this</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <sequence>
+              <choice>
                 <bgf:expression>
-                  <terminal>super</terminal>
+                  <marked>
+                    <bgf:expression>
+                      <sequence>
+                        <bgf:expression>
+                          <terminal>new</terminal>
+                        </bgf:expression>
+                        <bgf:expression>
+                          <nonterminal>InnerCreator</nonterminal>
+                        </bgf:expression>
+                      </sequence>
+                    </bgf:expression>
+                  </marked>
                 </bgf:expression>
                 <bgf:expression>
-                  <nonterminal>Arguments</nonterminal>
+                  <sequence>
+                    <bgf:expression>
+                      <terminal>super</terminal>
+                    </bgf:expression>
+                    <bgf:expression>
+                      <nonterminal>Arguments</nonterminal>
+                    </bgf:expression>
+                  </sequence>
                 </bgf:expression>
-              </sequence>
-            </bgf:expression>
-            <bgf:expression>
-              <sequence>
                 <bgf:expression>
-                  <terminal>new</terminal>
+                  <terminal>class</terminal>
                 </bgf:expression>
                 <bgf:expression>
-                  <nonterminal>InnerCreator</nonterminal>
+                  <terminal>this</terminal>
                 </bgf:expression>
-              </sequence>
+              </choice>
             </bgf:expression>
-          </choice>
+          </sequence>
         </bgf:expression>
-      </sequence>
-    </bgf:expression>
-  </xbgf:factor>
-  <xbgf:vertical>
-    <nonterminal>IdentifierSuffix</nonterminal>
-  </xbgf:vertical>
+      </bgf:production>
+    </horizontal>
+  </xbgf:add>
 
   <!-- ISSUE PERMISSIVENESS
   - Fail: Primary.
diff --git a/topics/java/lci/xbgf/extend-doc1.xbgf b/topics/java/lci/xbgf/extend-doc1.xbgf
index e447145d..e1e2fe0d 100644
--- a/topics/java/lci/xbgf/extend-doc1.xbgf
+++ b/topics/java/lci/xbgf/extend-doc1.xbgf
@@ -2,7 +2,7 @@
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-  <!-- ISSUE EXTEND GENERALIZE
+  <!-- ISSUE PERMISSIVENESS
      - Fail: ConstantDeclaration.
       - [], ,([?(n(ConstantModifiers)), n(Type), n(VariableDeclarator)])
      vs.
@@ -99,98 +99,88 @@
   </xbgf:add>
 
   <!-- 
-  Resolve brutally. Is there a better way?
-  
      - Fail: PrimaryNoNewArray.
-      - [], ;([n(Literal), t(this), ,([t((), n(Expression), t())]), n(ClassInstanceCreationExpression), n(FieldAccess), n(MethodInvocation), n(ArrayAccess)])
+      - [], ;([  n(Literal),
+                 t(this),
+              ,([t((), n(Expression), t())]),
+                 n(ClassInstanceCreationExpression),
+                 n(FieldAccess),
+                 n(MethodInvocation),
+                 n(ArrayAccess)])
      vs.
-      - [], ;([n(Literal), ,([n(Type), t(.), t(class)]), ,([t(void), t(.), t(class)]), t(this), ,([n(ClassName), t(.), t(this)]), ,([t((), n(Expression), t())]), n(ClassInstanceCreationExpression), n(FieldAccess), n(MethodInvocation), n(ArrayAccess)])
+      - [], ;([  n(Literal),
+              ,([n(Type), t(.), t(class)]),
+              ,([t(void), t(.), t(class)]),
+                 t(this),
+              ,([n(ClassName), t(.), t(this)]),
+              ,([t((), n(Expression), t())]),
+                 n(ClassInstanceCreationExpression),
+                 n(FieldAccess),
+                 n(MethodInvocation),
+                 n(ArrayAccess)])
     -->
-  <!-- BREFACTOR -->
-  <xbgf:redefine>
-    <bgf:production>
-      <nonterminal>PrimaryNoNewArray</nonterminal>
-      <bgf:expression>
-        <choice>
-          <bgf:expression>
-            <nonterminal>Literal</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <sequence>
-              <bgf:expression>
-                <nonterminal>Type</nonterminal>
-              </bgf:expression>
-              <bgf:expression>
-                <terminal>.</terminal>
-              </bgf:expression>
-              <bgf:expression>
-                <terminal>class</terminal>
-              </bgf:expression>
-            </sequence>
-          </bgf:expression>
-          <bgf:expression>
-            <sequence>
-              <bgf:expression>
-                <terminal>void</terminal>
-              </bgf:expression>
-              <bgf:expression>
-                <terminal>.</terminal>
-              </bgf:expression>
-              <bgf:expression>
-                <terminal>class</terminal>
-              </bgf:expression>
-            </sequence>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>this</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <sequence>
-              <bgf:expression>
-                <nonterminal>ClassName</nonterminal>
-              </bgf:expression>
-              <bgf:expression>
-                <terminal>.</terminal>
-              </bgf:expression>
-              <bgf:expression>
-                <terminal>this</terminal>
-              </bgf:expression>
-            </sequence>
-          </bgf:expression>
-          <bgf:expression>
-            <sequence>
-              <bgf:expression>
-                <terminal>(</terminal>
-              </bgf:expression>
-              <bgf:expression>
-                <nonterminal>Expression</nonterminal>
-              </bgf:expression>
-              <bgf:expression>
-                <terminal>)</terminal>
-              </bgf:expression>
-            </sequence>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>ClassInstanceCreationExpression</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>FieldAccess</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>MethodInvocation</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>ArrayAccess</nonterminal>
-          </bgf:expression>
-        </choice>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:redefine>
-  <xbgf:vertical>
-    <nonterminal>PrimaryNoNewArray</nonterminal>
-  </xbgf:vertical>
+  <xbgf:add>
+    <vertical>
+      <bgf:production>
+        <nonterminal>PrimaryNoNewArray</nonterminal>
+        <bgf:expression>
+          <sequence>
+            <bgf:expression>
+              <nonterminal>Type</nonterminal>
+            </bgf:expression>
+            <bgf:expression>
+              <terminal>.</terminal>
+            </bgf:expression>
+            <bgf:expression>
+              <terminal>class</terminal>
+            </bgf:expression>
+          </sequence>
+        </bgf:expression>
+      </bgf:production>
+    </vertical>
+  </xbgf:add>
+  <xbgf:add>
+    <vertical>
+      <bgf:production>
+        <nonterminal>PrimaryNoNewArray</nonterminal>
+        <bgf:expression>
+          <sequence>
+            <bgf:expression>
+              <terminal>void</terminal>
+            </bgf:expression>
+            <bgf:expression>
+              <terminal>.</terminal>
+            </bgf:expression>
+            <bgf:expression>
+              <terminal>class</terminal>
+            </bgf:expression>
+          </sequence>
+        </bgf:expression>
+      </bgf:production>
+    </vertical>
+  </xbgf:add>
+  <xbgf:add>
+    <vertical>
+      <bgf:production>
+        <nonterminal>PrimaryNoNewArray</nonterminal>
+        <bgf:expression>
+          <sequence>
+            <bgf:expression>
+              <nonterminal>ClassName</nonterminal>
+            </bgf:expression>
+            <bgf:expression>
+              <terminal>.</terminal>
+            </bgf:expression>
+            <bgf:expression>
+              <terminal>this</terminal>
+            </bgf:expression>
+          </sequence>
+        </bgf:expression>
+      </bgf:production>
+    </vertical>
+  </xbgf:add>
 
-  <!-- ISSUE EXTEND GENERALIZE
+  <!-- ISSUE EXTEND
      - Fail: LocalVariableDeclaration.
       - [], ,([n(Type), n(VariableDeclarators)])
      vs.
@@ -446,7 +436,7 @@
     </vertical>
   </xbgf:add>
 
-  <!-- ISSUE EXTEND GENERALIZE
+  <!-- ISSUE EXTEND
      - Fail: MethodInvocation.
       - [], ;([,([n(MethodName), t((), ?(n(ArgumentList)), t())]), ,([n(Primary), t(.), n(Identifier), t((), ?(n(ArgumentList)), t())]), ,([t(super), t(.), n(Identifier), t((), ?(n(ArgumentList)), t())])])
      vs.
@@ -592,7 +582,7 @@
     </vertical>
   </xbgf:add>
 
-  <!-- ISSUE EXTEND GENERALIZE
+  <!-- ISSUE EXTEND
      - Fail: FormalParameter.
       - [], ,([n(Type), n(VariableDeclaratorId)])
      vs.
diff --git a/topics/java/lci/xbgf/extend-doc12.xbgf b/topics/java/lci/xbgf/extend-doc12.xbgf
index 0a12d346..68a2e934 100644
--- a/topics/java/lci/xbgf/extend-doc12.xbgf
+++ b/topics/java/lci/xbgf/extend-doc12.xbgf
@@ -27,7 +27,7 @@
     </vertical>
   </xbgf:add>
 
-  <!-- ISSUE EXTEND GENERALIZE
+  <!-- ISSUE EXTEND
      - Fail: MethodHeader.
       - [], ,([?(n(MethodModifiers)), n(ResultType), n(MethodDeclarator), ?(n(Throws))])
      vs.
@@ -665,7 +665,7 @@
      vs.
       - [], ;([n(NormalInterfaceDeclaration), n(AnnotationTypeDeclaration)])
   -->
-  <xbgf:introduce>
+  <xbgf:import>
     <bgf:production>
       <nonterminal>DefaultValue</nonterminal>
       <bgf:expression>
@@ -679,8 +679,6 @@
         </sequence>
       </bgf:expression>
     </bgf:production>
-  </xbgf:introduce>
-  <xbgf:introduce>
     <bgf:production>
       <nonterminal>AnnotationTypeDeclaration</nonterminal>
       <bgf:expression>
@@ -707,8 +705,6 @@
         </sequence>
       </bgf:expression>
     </bgf:production>
-  </xbgf:introduce>
-  <xbgf:introduce>
     <bgf:production>
       <nonterminal>AnnotationTypeElementDeclaration</nonterminal>
       <bgf:expression>
@@ -781,8 +777,6 @@
         <terminal>;</terminal>
       </bgf:expression>
     </bgf:production>
-  </xbgf:introduce>
-  <xbgf:introduce>
     <bgf:production>
       <nonterminal>AnnotationTypeElementDeclarations</nonterminal>
       <bgf:expression>
@@ -802,9 +796,6 @@
         </sequence>
       </bgf:expression>
     </bgf:production>
-  </xbgf:introduce>
-  <!-- GENERALITY -->
-  <xbgf:define>
     <bgf:production>
       <nonterminal>AnnotationTypeBody</nonterminal>
       <bgf:expression>
@@ -825,7 +816,8 @@
         </sequence>
       </bgf:expression>
     </bgf:production>
-  </xbgf:define>
+  </xbgf:import>
+  
   <xbgf:chain>
     <bgf:production>
       <nonterminal>InterfaceDeclaration</nonterminal>
@@ -851,26 +843,7 @@
      vs.
       - [], ;([n(BasicForStatement), n(EnhancedForStatement)])
   -->
-  <xbgf:chain>
-    <bgf:production>
-      <nonterminal>ForStatement</nonterminal>
-      <bgf:expression>
-        <nonterminal>BasicForStatement</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:chain>
-  <xbgf:add>
-    <vertical>
-      <bgf:production>
-        <nonterminal>ForStatement</nonterminal>
-        <bgf:expression>
-          <nonterminal>EnhancedForStatement</nonterminal>
-        </bgf:expression>
-      </bgf:production>
-    </vertical>
-  </xbgf:add>
-  <!-- GENERALITY -->
-  <xbgf:define>
+  <xbgf:introduce>
     <bgf:production>
       <nonterminal>EnhancedForStatement</nonterminal>
       <bgf:expression>
@@ -909,7 +882,25 @@
         </sequence>
       </bgf:expression>
     </bgf:production>
-  </xbgf:define>
+  </xbgf:introduce>
+  <xbgf:chain>
+    <bgf:production>
+      <nonterminal>ForStatement</nonterminal>
+      <bgf:expression>
+        <nonterminal>BasicForStatement</nonterminal>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:chain>
+  <xbgf:add>
+    <vertical>
+      <bgf:production>
+        <nonterminal>ForStatement</nonterminal>
+        <bgf:expression>
+          <nonterminal>EnhancedForStatement</nonterminal>
+        </bgf:expression>
+      </bgf:production>
+    </vertical>
+  </xbgf:add>
 
   <!-- ISSUE EXTEND GENERALIZE
      - Fail: AbstractMethodDeclaration.
@@ -974,6 +965,48 @@
                ,([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:introduce>
+    <bgf:production>
+      <nonterminal>ReferenceTypeList</nonterminal>
+      <bgf:expression>
+        <nonterminal>ReferenceType</nonterminal>
+      </bgf:expression>
+    </bgf:production>
+    <bgf:production>
+      <nonterminal>ReferenceTypeList</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <nonterminal>ReferenceTypeList</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <terminal>,</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <nonterminal>ReferenceType</nonterminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:introduce>
+  <xbgf:introduce>
+    <bgf:production>
+      <nonterminal>NonWildTypeArguments</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <terminal>&lt;</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <nonterminal>ReferenceTypeList</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <terminal>&gt;</terminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:introduce>
   <xbgf:appear>
     <bgf:production>
       <nonterminal>MethodInvocation</nonterminal>
@@ -1186,7 +1219,7 @@
     </bgf:production>
   </xbgf:appear>
 
-  <!-- 
+  <!-- ISSUE EXTEND
      - Fail: FormalParameterList.
       - [], ;([n(FormalParameter), ,([n(FormalParameterList), t((,)), n(FormalParameter)])])
      vs.
@@ -1203,40 +1236,26 @@
       <to>FormalParameters</to>
     </nonterminal>
   </xbgf:rename>
-  <!-- GENERALITY -->
-  <xbgf:replace>
-    <bgf:expression>
-      <nonterminal>FormalParameters</nonterminal>
-    </bgf:expression>
-    <bgf:expression>
-      <nonterminal>FormalParameterList</nonterminal>
-    </bgf:expression>
+  <xbgf:horizontal>FormalParameters</xbgf:horizontal>
+  <xbgf:unfold>
+    <nonterminal>FormalParameters</nonterminal>
     <in>
       <nonterminal>MethodDeclarator</nonterminal>
     </in>
-  </xbgf:replace>
-  <!-- GENERALITY -->
-  <xbgf:replace>
-    <bgf:expression>
-      <nonterminal>FormalParameters</nonterminal>
-    </bgf:expression>
-    <bgf:expression>
-      <nonterminal>FormalParameterList</nonterminal>
-    </bgf:expression>
+  </xbgf:unfold>
+  <xbgf:unfold>
+    <nonterminal>FormalParameters</nonterminal>
     <in>
       <nonterminal>ConstructorDeclarator</nonterminal>
     </in>
-  </xbgf:replace>
-
-  <!-- ISSUE EXTEND -->
-  <!-- GENERALITY -->
-  <xbgf:define>
+  </xbgf:unfold>
+  <xbgf:extract>
     <bgf:production>
       <nonterminal>FormalParameterList</nonterminal>
       <bgf:expression>
         <choice>
           <bgf:expression>
-            <nonterminal>LastFormalParameter</nonterminal>
+            <nonterminal>FormalParameter</nonterminal>
           </bgf:expression>
           <bgf:expression>
             <sequence>
@@ -1247,26 +1266,37 @@
                 <terminal>,</terminal>
               </bgf:expression>
               <bgf:expression>
-                <nonterminal>LastFormalParameter</nonterminal>
+                <nonterminal>FormalParameter</nonterminal>
               </bgf:expression>
             </sequence>
           </bgf:expression>
         </choice>
       </bgf:expression>
     </bgf:production>
-  </xbgf:define>
+  </xbgf:extract>
+  <xbgf:unfold>
+    <nonterminal>FormalParameterList</nonterminal>
+    <in>
+      <nonterminal>FormalParameters</nonterminal>
+    </in>
+  </xbgf:unfold>
+  <xbgf:vertical>
+    <nonterminal>FormalParameters</nonterminal>
+  </xbgf:vertical>
   <xbgf:vertical>
     <nonterminal>FormalParameterList</nonterminal>
   </xbgf:vertical>
-  <!-- GENERALITY -->
-  <xbgf:define>
+  <xbgf:extract>
     <bgf:production>
       <nonterminal>LastFormalParameter</nonterminal>
       <bgf:expression>
         <nonterminal>FormalParameter</nonterminal>
       </bgf:expression>
     </bgf:production>
-  </xbgf:define>
+    <in>
+      <nonterminal>FormalParameterList</nonterminal>
+    </in>
+  </xbgf:extract>
   <xbgf:add>
     <vertical>
       <bgf:production>
@@ -1301,7 +1331,6 @@
      vs.
       - [], ,([?(n(ConstantModifiers)), n(Type), n(VariableDeclarators), t((;))])
   -->
-  <!-- REVISE -->
   <xbgf:inject>
     <bgf:production>
       <nonterminal>ConstantDeclaration</nonterminal>
@@ -1348,7 +1377,7 @@
     </bgf:production>
   </xbgf:introduce>
 
-  <!-- ISSUE PERMISSIVENESS
+  <!-- ISSUE EXTEND
      - Fail: Throws.
       - [], ,([t(throws), n(ClassTypeList)])
      vs.
@@ -1360,36 +1389,130 @@
       <to>ExceptionTypeList</to>
     </nonterminal>
   </xbgf:rename>
-  <!-- GENERALITY -->
-  <xbgf:redefine>
+  <xbgf:upgrade>
     <bgf:production>
       <nonterminal>ExceptionTypeList</nonterminal>
       <bgf:expression>
-        <choice>
+        <marked>
           <bgf:expression>
             <nonterminal>ExceptionType</nonterminal>
           </bgf:expression>
+        </marked>
+      </bgf:expression>
+    </bgf:production>
+    <bgf:production>
+      <nonterminal>ExceptionType</nonterminal>
+      <bgf:expression>
+        <nonterminal>ClassType</nonterminal>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:upgrade>
+  <xbgf:upgrade>
+    <bgf:production>
+      <nonterminal>ExceptionTypeList</nonterminal>
+      <bgf:expression>
+        <sequence>
           <bgf:expression>
-            <sequence>
-              <bgf:expression>
-                <nonterminal>ExceptionTypeList</nonterminal>
-              </bgf:expression>
-              <bgf:expression>
-                <terminal>,</terminal>
-              </bgf:expression>
+            <nonterminal>ExceptionTypeList</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <terminal>,</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <marked>
               <bgf:expression>
                 <nonterminal>ExceptionType</nonterminal>
               </bgf:expression>
-            </sequence>
+            </marked>
           </bgf:expression>
-        </choice>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+    <bgf:production>
+      <nonterminal>ExceptionType</nonterminal>
+      <bgf:expression>
+        <nonterminal>ClassType</nonterminal>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:upgrade>
+
+  <!-- 
+   - Fail: ArrayCreationExpression.
+      - [], ,([t(new), n(TypeName), n(Dims), n(ArrayInitializer)])
+      - [], ,([t(new), n(TypeName), n(DimExprs), ?(n(Dims))])
+     vs.
+      - [], ,([t(new), n(ClassOrInterfaceType), n(Dims), n(ArrayInitializer)])
+      - [], ,([t(new), n(ClassOrInterfaceType), n(DimExprs), ?(n(Dims))])
+  -->
+  <xbgf:extract>
+    <bgf:production>
+      <nonterminal>SurgeryOnTypeName</nonterminal>
+      <bgf:expression>
+        <nonterminal>TypeName</nonterminal>
       </bgf:expression>
     </bgf:production>
-  </xbgf:redefine>
+    <in>
+      <nonterminal>ArrayCreationExpression</nonterminal>
+    </in>
+  </xbgf:extract>
+  <xbgf:massage>
+    <bgf:expression>
+      <nonterminal>TypeName</nonterminal>
+    </bgf:expression>
+    <bgf:expression>
+      <choice>
+        <bgf:expression>
+          <selectable>
+            <selector>ClassType</selector>
+            <bgf:expression>
+              <nonterminal>TypeName</nonterminal>
+            </bgf:expression>
+          </selectable>
+        </bgf:expression>
+        <bgf:expression>
+          <selectable>
+            <selector>InterfaceType</selector>
+            <bgf:expression>
+              <nonterminal>TypeName</nonterminal>
+            </bgf:expression>
+          </selectable>
+        </bgf:expression>
+      </choice>
+    </bgf:expression>
+    <in>
+      <nonterminal>SurgeryOnTypeName</nonterminal>
+    </in>
+  </xbgf:massage>
   <xbgf:vertical>
-    <nonterminal>ExceptionTypeList</nonterminal>
+    <nonterminal>SurgeryOnTypeName</nonterminal>
   </xbgf:vertical>
-
+  <xbgf:fold>
+    <nonterminal>ClassType</nonterminal>
+    <in>
+      <label>ClassType</label>
+    </in>
+  </xbgf:fold>
+  <xbgf:unlabel>
+    <label>ClassType</label>
+  </xbgf:unlabel>  <xbgf:fold>
+    <nonterminal>InterfaceType</nonterminal>
+    <in>
+      <label>InterfaceType</label>
+    </in>
+  </xbgf:fold>
+  <xbgf:unlabel>
+    <label>InterfaceType</label>
+  </xbgf:unlabel>
+  <xbgf:horizontal>ClassOrInterfaceType</xbgf:horizontal>
+  <xbgf:horizontal>SurgeryOnTypeName</xbgf:horizontal>
+  <xbgf:fold>
+    <nonterminal>ClassOrInterfaceType</nonterminal>
+  </xbgf:fold>
+  <xbgf:inline>SurgeryOnTypeName</xbgf:inline>
+  <xbgf:vertical>
+    <nonterminal>ClassOrInterfaceType</nonterminal>
+  </xbgf:vertical>
+  
   <!-- ISSUE EXTEND -->
   <xbgf:introduce>
     <bgf:production>
@@ -1494,32 +1617,8 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:introduce>
-  <xbgf:introduce>
-    <bgf:production>
-      <nonterminal>TypeDeclSpecifier</nonterminal>
-      <bgf:expression>
-        <nonterminal>TypeName</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-    <bgf:production>
-      <nonterminal>TypeDeclSpecifier</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>ClassOrInterfaceType</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Identifier</nonterminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:introduce>
 
-  <!-- 
+  <!-- (still the same issue!)
    - Fail: InterfaceType.
       - [], n(TypeName)
      vs.
@@ -1529,47 +1628,90 @@
      vs.
       - [], ,([n(TypeDeclSpecifier), ?(n(TypeArguments))])
   -->
-  <!-- GENERALITY -->
-  <xbgf:redefine>
+  <xbgf:extract>
     <bgf:production>
+      <nonterminal>TypeDeclSpecifier</nonterminal>
+      <bgf:expression>
+        <nonterminal>TypeName</nonterminal>
+      </bgf:expression>
+    </bgf:production>
+    <in>
+      <nonterminal>ClassType</nonterminal>
+    </in>
+  </xbgf:extract>
+  <xbgf:fold>
+    <nonterminal>TypeDeclSpecifier</nonterminal>
+    <in>
       <nonterminal>InterfaceType</nonterminal>
+    </in>
+  </xbgf:fold>
+  <xbgf:add>
+    <vertical>
+      <bgf:production>
+        <nonterminal>TypeDeclSpecifier</nonterminal>
+        <bgf:expression>
+          <sequence>
+            <bgf:expression>
+              <nonterminal>ClassOrInterfaceType</nonterminal>
+            </bgf:expression>
+            <bgf:expression>
+              <terminal>.</terminal>
+            </bgf:expression>
+            <bgf:expression>
+              <nonterminal>Identifier</nonterminal>
+            </bgf:expression>
+          </sequence>
+        </bgf:expression>
+      </bgf:production>
+    </vertical>
+  </xbgf:add>
+  <xbgf:appear>
+    <bgf:production>
+      <nonterminal>ClassType</nonterminal>
       <bgf:expression>
         <sequence>
           <bgf:expression>
             <nonterminal>TypeDeclSpecifier</nonterminal>
           </bgf:expression>
           <bgf:expression>
-            <optional>
+            <marked>
               <bgf:expression>
-                <nonterminal>TypeArguments</nonterminal>
+                <optional>
+                  <bgf:expression>
+                    <nonterminal>TypeArguments</nonterminal>
+                  </bgf:expression>
+                </optional>
               </bgf:expression>
-            </optional>
+            </marked>
           </bgf:expression>
         </sequence>
       </bgf:expression>
     </bgf:production>
-  </xbgf:redefine>
-  <!-- GENERALITY -->
-  <xbgf:redefine>
+  </xbgf:appear>
+  <xbgf:appear>
     <bgf:production>
-      <nonterminal>ClassType</nonterminal>
+      <nonterminal>InterfaceType</nonterminal>
       <bgf:expression>
         <sequence>
           <bgf:expression>
             <nonterminal>TypeDeclSpecifier</nonterminal>
           </bgf:expression>
           <bgf:expression>
-            <optional>
+            <marked>
               <bgf:expression>
-                <nonterminal>TypeArguments</nonterminal>
+                <optional>
+                  <bgf:expression>
+                    <nonterminal>TypeArguments</nonterminal>
+                  </bgf:expression>
+                </optional>
               </bgf:expression>
-            </optional>
+            </marked>
           </bgf:expression>
         </sequence>
       </bgf:expression>
     </bgf:production>
-  </xbgf:redefine>
-
+  </xbgf:appear>
+ 
   <!-- ISSUE EXTEND 
      - Fail: ExplicitConstructorInvocation.
       - [], ;([,([t(this), t((), ?(n(ArgumentList)), t()), t((;))]),
@@ -1658,50 +1800,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  <xbgf:introduce>
-    <bgf:production>
-      <nonterminal>ReferenceTypeList</nonterminal>
-      <bgf:expression>
-        <nonterminal>ReferenceType</nonterminal>
-      </bgf:expression>
-    </bgf:production>
-    <bgf:production>
-      <nonterminal>ReferenceTypeList</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>ReferenceTypeList</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>,</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>ReferenceType</nonterminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:introduce>
-
-  <!-- GENERALITY -->
-  <xbgf:define>
-    <bgf:production>
-      <nonterminal>NonWildTypeArguments</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>&lt;</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>ReferenceTypeList</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>&gt;</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:define>
   <xbgf:appear>
     <bgf:production>
       <nonterminal>ExplicitConstructorInvocation</nonterminal>
@@ -1913,30 +2011,5 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-
-  <!-- 
-     - Fail: ArrayCreationExpression.
-      - [], ;([,([t(new), n(PrimitiveType), n(DimExprs), ?(n(Dims))]),
-               ,([t(new), n(TypeName), n(DimExprs), ?(n(Dims))]),
-               ,([t(new), n(PrimitiveType), n(Dims), n(ArrayInitializer)]),
-               ,([t(new), n(TypeName), n(Dims), n(ArrayInitializer)])])
-     vs.
-      - [], ;([,([t(new), n(PrimitiveType), n(DimExprs), ?(n(Dims))]),
-               ,([t(new), n(ClassOrInterfaceType), n(DimExprs), ?(n(Dims))]),
-               ,([t(new), n(PrimitiveType), n(Dims), n(ArrayInitializer)]),
-               ,([t(new), n(ClassOrInterfaceType), n(Dims), n(ArrayInitializer)])])
-  -->
-  <!-- GENERALITY -->
-  <xbgf:replace>
-    <bgf:expression>
-      <nonterminal>TypeName</nonterminal>
-    </bgf:expression>
-    <bgf:expression>
-      <nonterminal>ClassOrInterfaceType</nonterminal>
-    </bgf:expression>
-    <in>
-      <nonterminal>ArrayCreationExpression</nonterminal>
-    </in>
-  </xbgf:replace>
-
+ 
 </xbgf:sequence>
\ No newline at end of file