diff --git a/topics/java/lci/xbgf/correct-app1.xbgf b/topics/java/lci/xbgf/correct-app1.xbgf
index 6982f9ae..d631cc5a 100644
--- a/topics/java/lci/xbgf/correct-app1.xbgf
+++ b/topics/java/lci/xbgf/correct-app1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/correct-app2.xbgf b/topics/java/lci/xbgf/correct-app2.xbgf
index 7a577ea4..8eda2e23 100644
--- a/topics/java/lci/xbgf/correct-app2.xbgf
+++ b/topics/java/lci/xbgf/correct-app2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -28,7 +29,7 @@
   <!-- ISSUE CORRECT SPECERROR
   They forgot to define a nonterminal with "intuitive" name - we predicted it in ISO N3977! -->
   <!-- GENERALITY -->
-<!-- INITCORR -->
+  <!-- INITCORR -->
   <xbgf:define>
     <bgf:production>
       <nonterminal>ForUpdateOpt</nonterminal>
@@ -45,7 +46,7 @@
 
   <!-- ISSUE CORRECT SPECERROR
   let's complete some of the statements with a trailing semicolon-->
- <!-- CORRECTION -->
+  <!-- CORRECTION -->
   <xbgf:inject>
     <bgf:production>
       <nonterminal>Statement</nonterminal>
@@ -72,10 +73,10 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:inject>
-  
+
   <!-- ISSUE CORRECT SPECERROR
   Same for BreakStatement -->
- <!-- CORRECTION -->
+  <!-- CORRECTION -->
   <xbgf:inject>
     <bgf:production>
       <nonterminal>Statement</nonterminal>
@@ -121,14 +122,14 @@
       <nonterminal>Expression</nonterminal>
     </bgf:expression>
   </xbgf:replace>
-  
- <!-- ISSUE CORRECT INCOMPATIBILITY
+
+  <!-- ISSUE CORRECT INCOMPATIBILITY
    - Fail: VoidInterfaceMethodDeclaratorRest.
       - [], ,([n(FormalParameters), ?(,([t(throws), n(QualifiedIdentifierList)])), t((;))])
      vs.
       - [], ,([n(FormalParameters), n(BracketsOpt), ?(,([t(throws), n(QualifiedIdentifierList)])), t((;))])
  -->
- <!-- CORRECTION -->
+  <!-- CORRECTION -->
   <xbgf:appear>
     <bgf:production>
       <nonterminal>VoidInterfaceMethodDeclaratorRest</nonterminal>
@@ -182,7 +183,7 @@
       <nonterminal>VoidInterfaceMethodDeclaratorRest</nonterminal>
     </in>
   </xbgf:fold>
-  
+
   <!-- ISSUE CORRECT SPECERROR
   undefined non-terminals -->
   <!-- GENERALITY -->
diff --git a/topics/java/lci/xbgf/correct-app3.xbgf b/topics/java/lci/xbgf/correct-app3.xbgf
index ee79d303..59f63826 100644
--- a/topics/java/lci/xbgf/correct-app3.xbgf
+++ b/topics/java/lci/xbgf/correct-app3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -110,10 +111,10 @@ Annotation:
       </bgf:expression>
     </bgf:production>
   </xbgf:inject>
-  
+
   <!--   ISSUE CORRECT SPECERROR
          same with continue -->
-	  <!-- CORRECTION -->
+  <!-- CORRECTION -->
   <xbgf:inject>
     <bgf:production>
       <nonterminal>Statement</nonterminal>
@@ -286,7 +287,7 @@ FormalParameter:
       </bgf:expression>
     </bgf:production>
   </xbgf:define>
-  
+
   <!-- ISSUE CORRECT
   as in http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6442525
 * 18.1 does not permit the obsolescent array syntax in a method declaration of an annotation type:
@@ -335,7 +336,7 @@ FormalParameter:
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  
+
   <!-- I S S U E   C O R R E C T 
   as in http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6442525
 * 18.1 defines TypeArgument incorrectly, e.g. '? extends int' is legal.
diff --git a/topics/java/lci/xbgf/correct-doc1.xbgf b/topics/java/lci/xbgf/correct-doc1.xbgf
index 7a236057..bea776f8 100644
--- a/topics/java/lci/xbgf/correct-doc1.xbgf
+++ b/topics/java/lci/xbgf/correct-doc1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -88,7 +89,7 @@
 
   <!-- ISSUE CORRECT SPECERROR
        Another typo of JLS2 -->
-	  <!-- INITCORR -->
+  <!-- INITCORR -->
   <xbgf:unite>
     <add>Identifer</add>
     <to>Identifier</to>
@@ -228,5 +229,5 @@
   <xbgf:vertical>
     <nonterminal>CastExpression</nonterminal>
   </xbgf:vertical>
-  
+
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/correct-doc2.xbgf b/topics/java/lci/xbgf/correct-doc2.xbgf
index ed0739a3..c1fdc247 100644
--- a/topics/java/lci/xbgf/correct-doc2.xbgf
+++ b/topics/java/lci/xbgf/correct-doc2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -6,7 +7,7 @@
   <xbgf:reroot>
     <root>CompilationUnit</root>
   </xbgf:reroot>
-  
+
   <!-- ISSUE CORRECT SPECERROR
   This is an error (typo) in JLS2.
   
@@ -20,7 +21,7 @@
     <add>ConstantModifer</add>
     <to>ConstantModifier</to>
   </xbgf:unite>
-  
+
   <!-- ISSUE CORRECT SPECERROR
   Another typo of JLS2 -->
   <!-- INITCORR -->
@@ -61,7 +62,7 @@
   <xbgf:vertical>
     <nonterminal>ClassName</nonterminal>
   </xbgf:vertical>
-  
+
   <!-- ISSUE CORRECT SPECERROR
    - Fail: ConstructorDeclarator.
       - [], ,([n(Identifier), t((), ?(n(FormalParameterList)), t())])
@@ -210,5 +211,5 @@
   <xbgf:vertical>
     <nonterminal>CastExpression</nonterminal>
   </xbgf:vertical>
- 
+
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/correct-doc3.xbgf b/topics/java/lci/xbgf/correct-doc3.xbgf
index 851dcc49..2c956d37 100644
--- a/topics/java/lci/xbgf/correct-doc3.xbgf
+++ b/topics/java/lci/xbgf/correct-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -421,7 +422,7 @@
 
     the same problem
   -->
-<!-- KNOWNBUG -->
+  <!-- KNOWNBUG -->
   <xbgf:widen>
     <bgf:expression>
       <nonterminal>VariableModifiers</nonterminal>
diff --git a/topics/java/lci/xbgf/deyaccifyStatements.xbgf b/topics/java/lci/xbgf/deyaccifyStatements.xbgf
index 47489022..52f0aee1 100644
--- a/topics/java/lci/xbgf/deyaccifyStatements.xbgf
+++ b/topics/java/lci/xbgf/deyaccifyStatements.xbgf
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  
+
   <!-- 
    - Fail: SwitchBlockStatementGroups.
       - [], *(n(SwitchBlockStatementGroup))
@@ -42,7 +43,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:extract>
-  
+
   <!--  
    - Fail: Catches.
       - [], ,([n(CatchClause), *(n(CatchClause))])
@@ -59,4 +60,4 @@
   -->
   <xbgf:deyaccify>BlockStatements</xbgf:deyaccify>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/edit-doc1.xbgf b/topics/java/lci/xbgf/edit-doc1.xbgf
index 11b32ec6..2393c954 100644
--- a/topics/java/lci/xbgf/edit-doc1.xbgf
+++ b/topics/java/lci/xbgf/edit-doc1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -50,7 +51,7 @@
       <nonterminal>TypeImportOnDemandDeclaration</nonterminal>
     </in>
   </xbgf:fold>
-  
+
 
   <!-- 
   Local substitution:
@@ -308,5 +309,5 @@
   <xbgf:vertical>
     <nonterminal>ClassInstanceCreationExpression</nonterminal>
   </xbgf:vertical>
-  
-</xbgf:sequence>
+
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/edit-doc2.xbgf b/topics/java/lci/xbgf/edit-doc2.xbgf
index 9a7a0e97..6e5acd4c 100644
--- a/topics/java/lci/xbgf/edit-doc2.xbgf
+++ b/topics/java/lci/xbgf/edit-doc2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -1380,7 +1381,7 @@
     <xbgf:vertical>
       <nonterminal>ArrayInitializer</nonterminal>
     </xbgf:vertical>
-  <!-- CORRECTION -->
+    <!-- CORRECTION -->
     <xbgf:disappear>
       <bgf:production>
         <nonterminal>ArrayInitializer</nonterminal>
diff --git a/topics/java/lci/xbgf/edit-doc3.xbgf b/topics/java/lci/xbgf/edit-doc3.xbgf
index f26f8c8d..dc4e7c98 100644
--- a/topics/java/lci/xbgf/edit-doc3.xbgf
+++ b/topics/java/lci/xbgf/edit-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -39,12 +40,12 @@
       </bgf:production>
     </vertical>
   </xbgf:add>
-  
+
   <!-- finishing touches -->
   <xbgf:eliminate>FormalParameterList</xbgf:eliminate>
   <xbgf:eliminate>LastFormalParameter</xbgf:eliminate>
   <xbgf:eliminate>NonWildTypeArguments</xbgf:eliminate>
   <xbgf:eliminate>ReferenceTypeList</xbgf:eliminate>
   <xbgf:eliminate>TypeDeclSpecifier</xbgf:eliminate>
-  
+
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/editDeclarations.xbgf b/topics/java/lci/xbgf/editDeclarations.xbgf
index 5d9e818a..f846541b 100644
--- a/topics/java/lci/xbgf/editDeclarations.xbgf
+++ b/topics/java/lci/xbgf/editDeclarations.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -254,7 +255,7 @@
   <xbgf:fold>
     <nonterminal>QualifiedIdentifierList</nonterminal>
   </xbgf:fold>
-  
+
   <!--  
    - Fail: InterfaceDeclaration.
       - [], ,([?(n(Modifiers)), t(interface), n(Identifier), ?(n(ExtendsInterfaces)), n(InterfaceBody)])
@@ -1315,7 +1316,7 @@
       </in>
     </xbgf:extract>
   </xbgf:atomic>
-  
+
   <!-- ISSUE EXTEND
    - Fail: InterfaceMemberDecl.
       - [], ;([n(InterfaceMethodOrFieldDecl), ,([t(void), n(Identifier), n(VoidInterfaceMethodDeclaratorRest)])])
@@ -1985,7 +1986,7 @@ Block:
     </bgf:production>
   </xbgf:upgrade>
   <xbgf:inline>ConstructorBody</xbgf:inline>
-  
+
   <!-- ISSUE EXTEND
   Empty class body declaration -->
   <!-- EXTENSION -->
diff --git a/topics/java/lci/xbgf/editExpressions-doc2.xbgf b/topics/java/lci/xbgf/editExpressions-doc2.xbgf
index 24a491d8..9c211e9b 100644
--- a/topics/java/lci/xbgf/editExpressions-doc2.xbgf
+++ b/topics/java/lci/xbgf/editExpressions-doc2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -257,8 +258,8 @@
         </bgf:expression>
       </bgf:production>
     </xbgf:introduce>
-     <!-- RELAXATION -->
-   <xbgf:add>
+    <!-- RELAXATION -->
+    <xbgf:add>
       <vertical>
         <bgf:production>
           <nonterminal>Primary</nonterminal>
@@ -720,4 +721,4 @@
     </vertical>
   </xbgf:remove>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/editExpressions-doc3.xbgf b/topics/java/lci/xbgf/editExpressions-doc3.xbgf
index f3da7a09..2a76d052 100644
--- a/topics/java/lci/xbgf/editExpressions-doc3.xbgf
+++ b/topics/java/lci/xbgf/editExpressions-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -1099,7 +1100,7 @@
       <nonterminal>ForControl</nonterminal>
     </in>
   </xbgf:narrow>
-   <xbgf:extract>
+  <xbgf:extract>
     <bgf:production>
       <nonterminal>ForVarControlRest</nonterminal>
       <bgf:expression>
diff --git a/topics/java/lci/xbgf/editExpressions-jls1.xbgf b/topics/java/lci/xbgf/editExpressions-jls1.xbgf
index eb3a8379..f7eceb75 100644
--- a/topics/java/lci/xbgf/editExpressions-jls1.xbgf
+++ b/topics/java/lci/xbgf/editExpressions-jls1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -398,8 +399,8 @@
     </bgf:production>
   </xbgf:define>
   <!-- GENERALITY -->
-   <!-- RELAXATION -->
- <xbgf:define>
+  <!-- RELAXATION -->
+  <xbgf:define>
     <bgf:production>
       <nonterminal>ArrayCreatorRest</nonterminal>
       <bgf:expression>
@@ -598,4 +599,4 @@
     </bgf:production>
   </xbgf:appear>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/eliminate-doc2.xbgf b/topics/java/lci/xbgf/eliminate-doc2.xbgf
index c9fb1d60..228c03da 100644
--- a/topics/java/lci/xbgf/eliminate-doc2.xbgf
+++ b/topics/java/lci/xbgf/eliminate-doc2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/extend-doc1.xbgf b/topics/java/lci/xbgf/extend-doc1.xbgf
index d1fe9e16..3a6a5196 100644
--- a/topics/java/lci/xbgf/extend-doc1.xbgf
+++ b/topics/java/lci/xbgf/extend-doc1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/extend-doc12.xbgf b/topics/java/lci/xbgf/extend-doc12.xbgf
index c1058207..582670d3 100644
--- a/topics/java/lci/xbgf/extend-doc12.xbgf
+++ b/topics/java/lci/xbgf/extend-doc12.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -833,7 +834,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:import>
-  
+
   <xbgf:chain>
     <bgf:production>
       <nonterminal>InterfaceDeclaration</nonterminal>
@@ -1533,7 +1534,7 @@
   <xbgf:vertical>
     <nonterminal>ClassOrInterfaceType</nonterminal>
   </xbgf:vertical>
-  
+
   <!-- ISSUE EXTEND -->
   <xbgf:introduce>
     <bgf:production>
@@ -1735,7 +1736,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
- 
+
   <!-- ISSUE EXTEND 
      - Fail: ExplicitConstructorInvocation.
       - [], ;([,([t(this), t((), ?(n(ArgumentList)), t()), t((;))]),
@@ -2041,5 +2042,5 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
- 
+
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/extend-jls1.xbgf b/topics/java/lci/xbgf/extend-jls1.xbgf
index 69f18e6f..bd5e0a31 100644
--- a/topics/java/lci/xbgf/extend-jls1.xbgf
+++ b/topics/java/lci/xbgf/extend-jls1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/extendClassDeclarations.xbgf b/topics/java/lci/xbgf/extendClassDeclarations.xbgf
index 2364b937..9e567026 100644
--- a/topics/java/lci/xbgf/extendClassDeclarations.xbgf
+++ b/topics/java/lci/xbgf/extendClassDeclarations.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/extendDeclarations.xbgf b/topics/java/lci/xbgf/extendDeclarations.xbgf
index b31a0bdd..dd45e80a 100644
--- a/topics/java/lci/xbgf/extendDeclarations.xbgf
+++ b/topics/java/lci/xbgf/extendDeclarations.xbgf
@@ -1,365 +1,365 @@
-<?xml version="1.0"?>
-<xbgf:sequence
-  xmlns:bgf="http://planet-sl.org/bgf"
-  xmlns:xbgf="http://planet-sl.org/xbgf">
-
-  <!--
-   - Fail: ConstructorDeclaratorRest.
-      - [], ,([n(FormalParameters), ?(,([t(throws), n(QualifiedIdentifierList)])), n(MethodBody)])
-     vs.
-      - [], ,([t((), ?(n(FormalParameterDecls)), t()), ?(,([t(throws), n(QualifiedIdentifierList)])), n(MethodBody)])
--->
-  <xbgf:inline>FormalParameters</xbgf:inline>
-
-  <!-- ISSUE EXTEND
-   - Fail: ImportDeclaration.
-      - [], ,([t(import),               n(QualifiedIdentifier),                     ?(,([t(.), t(*)])), t((;))])
-     vs.
-      - [], ,([t(import), ?(t(static)), n(Identifier), *(,([t(.), n(Identifier)])), ?(,([t(.), t(*)])), t((;))])
-  -->
-  <xbgf:unfold>
-    <nonterminal>QualifiedIdentifier</nonterminal>
-    <in>
-      <nonterminal>ImportDeclaration</nonterminal>
-    </in>
-  </xbgf:unfold>
-  <!-- EXTENSION -->
-  <xbgf:appear>
-    <bgf:production>
-      <nonterminal>ImportDeclaration</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>import</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <marked>
-              <bgf:expression>
-                <optional>
-                  <bgf:expression>
-                    <terminal>static</terminal>
-                  </bgf:expression>
-                </optional>
-              </bgf:expression>
-            </marked>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Identifier</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <star>
-              <bgf:expression>
-                <sequence>
-                  <bgf:expression>
-                    <terminal>.</terminal>
-                  </bgf:expression>
-                  <bgf:expression>
-                    <nonterminal>Identifier</nonterminal>
-                  </bgf:expression>
-                </sequence>
-              </bgf:expression>
-            </star>
-          </bgf:expression>
-          <bgf:expression>
-            <optional>
-              <bgf:expression>
-                <sequence>
-                  <bgf:expression>
-                    <terminal>.</terminal>
-                  </bgf:expression>
-                  <bgf:expression>
-                    <terminal>*</terminal>
-                  </bgf:expression>
-                </sequence>
-              </bgf:expression>
-            </optional>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>;</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:appear>
-  <xbgf:unfold>
-    <nonterminal>ModifiersOpt</nonterminal>
-    <in>
-      <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
-    </in>
-  </xbgf:unfold>
-  <!-- RELAXATION -->
-  <xbgf:disappear>
-    <bgf:production>
-      <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <marked>
-              <bgf:expression>
-                <star>
-                  <bgf:expression>
-                    <nonterminal>Modifier</nonterminal>
-                  </bgf:expression>
-                </star>
-              </bgf:expression>
-            </marked>
-          </bgf:expression>
-          <bgf:expression>
-            <choice>
-              <bgf:expression>
-                <nonterminal>ClassDeclaration</nonterminal>
-              </bgf:expression>
-              <bgf:expression>
-                <nonterminal>InterfaceDeclaration</nonterminal>
-              </bgf:expression>
-            </choice>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:disappear>
-  <xbgf:unfold>
-    <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
-  </xbgf:unfold>
-
-  <!--
-   - Fail: TypeDeclaration.
-      - [], ;([n(ClassDeclaration), n(InterfaceDeclaration)])
-     vs.
-      - [], n(ClassOrInterfaceDeclaration)
-  -->
-  <xbgf:fold>
-    <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
-    <in>
-      <nonterminal>TypeDeclaration</nonterminal>
-    </in>
-  </xbgf:fold>
-  <xbgf:fold>
-    <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
-    <in>
-      <nonterminal>BlockStatement</nonterminal>
-    </in>
-  </xbgf:fold>
-  <!-- return ClassOrInterfaceDeclaration to its original form -->
-  <!-- RELAXATION -->
-  <xbgf:appear>
-    <bgf:production>
-      <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <marked>
-              <bgf:expression>
-                <star>
-                  <bgf:expression>
-                    <nonterminal>Modifier</nonterminal>
-                  </bgf:expression>
-                </star>
-              </bgf:expression>
-            </marked>
-          </bgf:expression>
-          <bgf:expression>
-            <choice>
-              <bgf:expression>
-                <nonterminal>ClassDeclaration</nonterminal>
-              </bgf:expression>
-              <bgf:expression>
-                <nonterminal>InterfaceDeclaration</nonterminal>
-              </bgf:expression>
-            </choice>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:appear>
-  <xbgf:fold>
-    <nonterminal>ModifiersOpt</nonterminal>
-    <in>
-      <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
-    </in>
-  </xbgf:fold>
-
-  <!-- ISSUE EXTEND
-   - Fail: IdentifierSuffix.
-      - [], ,([t(.), ;([t(class),                               t(this), ,([t(super), n(Arguments)]), ,([t(new),                                 n(InnerCreator)])])])
-     vs.
-      - [], ,([t(.), ;([t(class), n(ExplicitGenericInvocation), t(this), ,([t(super), n(Arguments)]), ,([t(new), ?(n(NonWildcardTypeArguments)), n(InnerCreator)])])])
-  -->
-  <xbgf:introduce>
-    <bgf:production>
-      <nonterminal>NonWildcardTypeArguments</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>&lt;</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>TypeList</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <terminal>&gt;</terminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:introduce>
-  <xbgf:introduce>
-    <bgf:production>
-      <nonterminal>ExplicitGenericInvocationSuffix</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>super</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>SuperSuffix</nonterminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-    <bgf:production>
-      <nonterminal>ExplicitGenericInvocationSuffix</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>Identifier</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>Arguments</nonterminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:introduce>
-  <xbgf:introduce>
-    <bgf:production>
-      <nonterminal>ExplicitGenericInvocation</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <nonterminal>NonWildcardTypeArguments</nonterminal>
-          </bgf:expression>
-          <bgf:expression>
-            <nonterminal>ExplicitGenericInvocationSuffix</nonterminal>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:introduce>
-
-  <!-- EXTENSION -->
-  <xbgf:add>
-    <horizontal>
-      <bgf:production>
-        <nonterminal>IdentifierSuffix</nonterminal>
-        <bgf:expression>
-          <sequence>
-            <bgf:expression>
-              <terminal>.</terminal>
-            </bgf:expression>
-            <bgf:expression>
-              <choice>
-                <bgf:expression>
-                  <marked>
-                    <bgf:expression>
-                      <nonterminal>ExplicitGenericInvocation</nonterminal>
-                    </bgf:expression>
-                  </marked>
-                </bgf:expression>
-                <bgf:expression>
-                  <terminal>class</terminal>
-                </bgf:expression>
-                <bgf:expression>
-                  <terminal>this</terminal>
-                </bgf:expression>
-                <bgf:expression>
-                  <sequence>
-                    <bgf:expression>
-                      <terminal>super</terminal>
-                    </bgf:expression>
-                    <bgf:expression>
-                      <nonterminal>Arguments</nonterminal>
-                    </bgf:expression>
-                  </sequence>
-                </bgf:expression>
-                <bgf:expression>
-                  <sequence>
-                    <bgf:expression>
-                      <terminal>new</terminal>
-                    </bgf:expression>
-                    <bgf:expression>
-                      <nonterminal>InnerCreator</nonterminal>
-                    </bgf:expression>
-                  </sequence>
-                </bgf:expression>
-              </choice>
-            </bgf:expression>
-          </sequence>
-        </bgf:expression>
-      </bgf:production>
-    </horizontal>
-  </xbgf:add>
-  <!-- EXTENSION -->
-  <xbgf:appear>
-    <bgf:production>
-      <nonterminal>IdentifierSuffix</nonterminal>
-      <bgf:expression>
-        <sequence>
-          <bgf:expression>
-            <terminal>.</terminal>
-          </bgf:expression>
-          <bgf:expression>
-            <choice>
-              <bgf:expression>
-                <terminal>class</terminal>
-              </bgf:expression>
-              <bgf:expression>
-                <nonterminal>ExplicitGenericInvocation</nonterminal>
-              </bgf:expression>
-              <bgf:expression>
-                <terminal>this</terminal>
-              </bgf:expression>
-              <bgf:expression>
-                <sequence>
-                  <bgf:expression>
-                    <terminal>super</terminal>
-                  </bgf:expression>
-                  <bgf:expression>
-                    <nonterminal>Arguments</nonterminal>
-                  </bgf:expression>
-                </sequence>
-              </bgf:expression>
-              <bgf:expression>
-                <sequence>
-                  <bgf:expression>
-                    <terminal>new</terminal>
-                  </bgf:expression>
-                  <bgf:expression>
-                    <marked>
-                      <bgf:expression>
-                        <optional>
-                          <bgf:expression>
-                            <nonterminal>NonWildcardTypeArguments</nonterminal>
-                          </bgf:expression>
-                        </optional>
-                      </bgf:expression>
-                    </marked>
-                  </bgf:expression>
-                  <bgf:expression>
-                    <nonterminal>InnerCreator</nonterminal>
-                  </bgf:expression>
-                </sequence>
-              </bgf:expression>
-            </choice>
-          </bgf:expression>
-        </sequence>
-      </bgf:expression>
-    </bgf:production>
-  </xbgf:appear>
-
-  <!-- extendWithAnnotations.xbgf -->
-  <!-- extendClassDeclarations.xbgf -->
-  <!-- extendInterfaceDeclarations.xbgf -->
-  <!-- extendWithTypeArguments.xbgf -->
-
+<?xml version="1.0" encoding="utf-8"?>
+<xbgf:sequence
+  xmlns:bgf="http://planet-sl.org/bgf"
+  xmlns:xbgf="http://planet-sl.org/xbgf">
+
+  <!--
+   - Fail: ConstructorDeclaratorRest.
+      - [], ,([n(FormalParameters), ?(,([t(throws), n(QualifiedIdentifierList)])), n(MethodBody)])
+     vs.
+      - [], ,([t((), ?(n(FormalParameterDecls)), t()), ?(,([t(throws), n(QualifiedIdentifierList)])), n(MethodBody)])
+-->
+  <xbgf:inline>FormalParameters</xbgf:inline>
+
+  <!-- ISSUE EXTEND
+   - Fail: ImportDeclaration.
+      - [], ,([t(import),               n(QualifiedIdentifier),                     ?(,([t(.), t(*)])), t((;))])
+     vs.
+      - [], ,([t(import), ?(t(static)), n(Identifier), *(,([t(.), n(Identifier)])), ?(,([t(.), t(*)])), t((;))])
+  -->
+  <xbgf:unfold>
+    <nonterminal>QualifiedIdentifier</nonterminal>
+    <in>
+      <nonterminal>ImportDeclaration</nonterminal>
+    </in>
+  </xbgf:unfold>
+  <!-- EXTENSION -->
+  <xbgf:appear>
+    <bgf:production>
+      <nonterminal>ImportDeclaration</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <terminal>import</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <marked>
+              <bgf:expression>
+                <optional>
+                  <bgf:expression>
+                    <terminal>static</terminal>
+                  </bgf:expression>
+                </optional>
+              </bgf:expression>
+            </marked>
+          </bgf:expression>
+          <bgf:expression>
+            <nonterminal>Identifier</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <star>
+              <bgf:expression>
+                <sequence>
+                  <bgf:expression>
+                    <terminal>.</terminal>
+                  </bgf:expression>
+                  <bgf:expression>
+                    <nonterminal>Identifier</nonterminal>
+                  </bgf:expression>
+                </sequence>
+              </bgf:expression>
+            </star>
+          </bgf:expression>
+          <bgf:expression>
+            <optional>
+              <bgf:expression>
+                <sequence>
+                  <bgf:expression>
+                    <terminal>.</terminal>
+                  </bgf:expression>
+                  <bgf:expression>
+                    <terminal>*</terminal>
+                  </bgf:expression>
+                </sequence>
+              </bgf:expression>
+            </optional>
+          </bgf:expression>
+          <bgf:expression>
+            <terminal>;</terminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:appear>
+  <xbgf:unfold>
+    <nonterminal>ModifiersOpt</nonterminal>
+    <in>
+      <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
+    </in>
+  </xbgf:unfold>
+  <!-- RELAXATION -->
+  <xbgf:disappear>
+    <bgf:production>
+      <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <marked>
+              <bgf:expression>
+                <star>
+                  <bgf:expression>
+                    <nonterminal>Modifier</nonterminal>
+                  </bgf:expression>
+                </star>
+              </bgf:expression>
+            </marked>
+          </bgf:expression>
+          <bgf:expression>
+            <choice>
+              <bgf:expression>
+                <nonterminal>ClassDeclaration</nonterminal>
+              </bgf:expression>
+              <bgf:expression>
+                <nonterminal>InterfaceDeclaration</nonterminal>
+              </bgf:expression>
+            </choice>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:disappear>
+  <xbgf:unfold>
+    <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
+  </xbgf:unfold>
+
+  <!--
+   - Fail: TypeDeclaration.
+      - [], ;([n(ClassDeclaration), n(InterfaceDeclaration)])
+     vs.
+      - [], n(ClassOrInterfaceDeclaration)
+  -->
+  <xbgf:fold>
+    <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
+    <in>
+      <nonterminal>TypeDeclaration</nonterminal>
+    </in>
+  </xbgf:fold>
+  <xbgf:fold>
+    <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
+    <in>
+      <nonterminal>BlockStatement</nonterminal>
+    </in>
+  </xbgf:fold>
+  <!-- return ClassOrInterfaceDeclaration to its original form -->
+  <!-- RELAXATION -->
+  <xbgf:appear>
+    <bgf:production>
+      <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <marked>
+              <bgf:expression>
+                <star>
+                  <bgf:expression>
+                    <nonterminal>Modifier</nonterminal>
+                  </bgf:expression>
+                </star>
+              </bgf:expression>
+            </marked>
+          </bgf:expression>
+          <bgf:expression>
+            <choice>
+              <bgf:expression>
+                <nonterminal>ClassDeclaration</nonterminal>
+              </bgf:expression>
+              <bgf:expression>
+                <nonterminal>InterfaceDeclaration</nonterminal>
+              </bgf:expression>
+            </choice>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:appear>
+  <xbgf:fold>
+    <nonterminal>ModifiersOpt</nonterminal>
+    <in>
+      <nonterminal>ClassOrInterfaceDeclaration</nonterminal>
+    </in>
+  </xbgf:fold>
+
+  <!-- ISSUE EXTEND
+   - Fail: IdentifierSuffix.
+      - [], ,([t(.), ;([t(class),                               t(this), ,([t(super), n(Arguments)]), ,([t(new),                                 n(InnerCreator)])])])
+     vs.
+      - [], ,([t(.), ;([t(class), n(ExplicitGenericInvocation), t(this), ,([t(super), n(Arguments)]), ,([t(new), ?(n(NonWildcardTypeArguments)), n(InnerCreator)])])])
+  -->
+  <xbgf:introduce>
+    <bgf:production>
+      <nonterminal>NonWildcardTypeArguments</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <terminal>&lt;</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <nonterminal>TypeList</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <terminal>&gt;</terminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:introduce>
+  <xbgf:introduce>
+    <bgf:production>
+      <nonterminal>ExplicitGenericInvocationSuffix</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <terminal>super</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <nonterminal>SuperSuffix</nonterminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+    <bgf:production>
+      <nonterminal>ExplicitGenericInvocationSuffix</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <nonterminal>Identifier</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <nonterminal>Arguments</nonterminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:introduce>
+  <xbgf:introduce>
+    <bgf:production>
+      <nonterminal>ExplicitGenericInvocation</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <nonterminal>NonWildcardTypeArguments</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <nonterminal>ExplicitGenericInvocationSuffix</nonterminal>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:introduce>
+
+  <!-- EXTENSION -->
+  <xbgf:add>
+    <horizontal>
+      <bgf:production>
+        <nonterminal>IdentifierSuffix</nonterminal>
+        <bgf:expression>
+          <sequence>
+            <bgf:expression>
+              <terminal>.</terminal>
+            </bgf:expression>
+            <bgf:expression>
+              <choice>
+                <bgf:expression>
+                  <marked>
+                    <bgf:expression>
+                      <nonterminal>ExplicitGenericInvocation</nonterminal>
+                    </bgf:expression>
+                  </marked>
+                </bgf:expression>
+                <bgf:expression>
+                  <terminal>class</terminal>
+                </bgf:expression>
+                <bgf:expression>
+                  <terminal>this</terminal>
+                </bgf:expression>
+                <bgf:expression>
+                  <sequence>
+                    <bgf:expression>
+                      <terminal>super</terminal>
+                    </bgf:expression>
+                    <bgf:expression>
+                      <nonterminal>Arguments</nonterminal>
+                    </bgf:expression>
+                  </sequence>
+                </bgf:expression>
+                <bgf:expression>
+                  <sequence>
+                    <bgf:expression>
+                      <terminal>new</terminal>
+                    </bgf:expression>
+                    <bgf:expression>
+                      <nonterminal>InnerCreator</nonterminal>
+                    </bgf:expression>
+                  </sequence>
+                </bgf:expression>
+              </choice>
+            </bgf:expression>
+          </sequence>
+        </bgf:expression>
+      </bgf:production>
+    </horizontal>
+  </xbgf:add>
+  <!-- EXTENSION -->
+  <xbgf:appear>
+    <bgf:production>
+      <nonterminal>IdentifierSuffix</nonterminal>
+      <bgf:expression>
+        <sequence>
+          <bgf:expression>
+            <terminal>.</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <choice>
+              <bgf:expression>
+                <terminal>class</terminal>
+              </bgf:expression>
+              <bgf:expression>
+                <nonterminal>ExplicitGenericInvocation</nonterminal>
+              </bgf:expression>
+              <bgf:expression>
+                <terminal>this</terminal>
+              </bgf:expression>
+              <bgf:expression>
+                <sequence>
+                  <bgf:expression>
+                    <terminal>super</terminal>
+                  </bgf:expression>
+                  <bgf:expression>
+                    <nonterminal>Arguments</nonterminal>
+                  </bgf:expression>
+                </sequence>
+              </bgf:expression>
+              <bgf:expression>
+                <sequence>
+                  <bgf:expression>
+                    <terminal>new</terminal>
+                  </bgf:expression>
+                  <bgf:expression>
+                    <marked>
+                      <bgf:expression>
+                        <optional>
+                          <bgf:expression>
+                            <nonterminal>NonWildcardTypeArguments</nonterminal>
+                          </bgf:expression>
+                        </optional>
+                      </bgf:expression>
+                    </marked>
+                  </bgf:expression>
+                  <bgf:expression>
+                    <nonterminal>InnerCreator</nonterminal>
+                  </bgf:expression>
+                </sequence>
+              </bgf:expression>
+            </choice>
+          </bgf:expression>
+        </sequence>
+      </bgf:expression>
+    </bgf:production>
+  </xbgf:appear>
+
+  <!-- extendWithAnnotations.xbgf -->
+  <!-- extendClassDeclarations.xbgf -->
+  <!-- extendInterfaceDeclarations.xbgf -->
+  <!-- extendWithTypeArguments.xbgf -->
+
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/extendExpressions.xbgf b/topics/java/lci/xbgf/extendExpressions.xbgf
index fb78cfba..7716a452 100644
--- a/topics/java/lci/xbgf/extendExpressions.xbgf
+++ b/topics/java/lci/xbgf/extendExpressions.xbgf
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -191,7 +191,7 @@ CreatedName:
       </bgf:expression>
     </bgf:production>
   </xbgf:appear>
-  
+
   <!-- ISSUE EXTEND
    - Fail: Primary.
       - [], ,([n(QualifiedIdentifier), ?(n(IdentifierSuffix))])
@@ -237,7 +237,7 @@ CreatedName:
       </bgf:production>
     </vertical>
   </xbgf:add>
-  
+
   <!--
    - Fail: Expression3.
       - [], ,([t((), n(Type), t()), n(Expression3)])
@@ -405,7 +405,7 @@ CreatedName:
   <xbgf:vertical>
     <nonterminal>Expression3</nonterminal>
   </xbgf:vertical>
-  
+
   <!-- ISSUE PERMISSIVENESS
   - Fail: Expression3.
       - [], ,([n(Primary), *(n(Selector)), *(n(PostfixOp))])
@@ -557,4 +557,4 @@ CreatedName:
   <xbgf:vertical>
     <nonterminal>Expression3</nonterminal>
   </xbgf:vertical>
-</xbgf:sequence> 
\ No newline at end of file
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/extendInterfaceDeclarations.xbgf b/topics/java/lci/xbgf/extendInterfaceDeclarations.xbgf
index a3b22c87..8b12196f 100644
--- a/topics/java/lci/xbgf/extendInterfaceDeclarations.xbgf
+++ b/topics/java/lci/xbgf/extendInterfaceDeclarations.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/extendModifiers.xbgf b/topics/java/lci/xbgf/extendModifiers.xbgf
index f3bd3ddc..be7376cb 100644
--- a/topics/java/lci/xbgf/extendModifiers.xbgf
+++ b/topics/java/lci/xbgf/extendModifiers.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -361,9 +362,9 @@
   <xbgf:extract>
     <bgf:production>
       <nonterminal>VariableModifiers</nonterminal>
-          <bgf:expression>
-            <terminal>final</terminal>
-          </bgf:expression>
+      <bgf:expression>
+        <terminal>final</terminal>
+      </bgf:expression>
     </bgf:production>
     <in>
       <nonterminal>FormalParameter</nonterminal>
diff --git a/topics/java/lci/xbgf/extendStatements.xbgf b/topics/java/lci/xbgf/extendStatements.xbgf
index d474e56d..05e3586b 100644
--- a/topics/java/lci/xbgf/extendStatements.xbgf
+++ b/topics/java/lci/xbgf/extendStatements.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -32,7 +33,7 @@
       </bgf:production>
     </vertical>
   </xbgf:remove>
-  
+
   <!-- 
    - Fail: Statement.
       - [], ,([t(for), t((), ?(n(ForInit)), t((;)), ?(n(Expression)), t((;)), ?(n(ForUpdate)), t()), n(Statement)])
diff --git a/topics/java/lci/xbgf/extendWithAnnotations.xbgf b/topics/java/lci/xbgf/extendWithAnnotations.xbgf
index 5eff0b65..c0c03a98 100644
--- a/topics/java/lci/xbgf/extendWithAnnotations.xbgf
+++ b/topics/java/lci/xbgf/extendWithAnnotations.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/extendWithTypeArguments.xbgf b/topics/java/lci/xbgf/extendWithTypeArguments.xbgf
index 95784070..a06c02ad 100644
--- a/topics/java/lci/xbgf/extendWithTypeArguments.xbgf
+++ b/topics/java/lci/xbgf/extendWithTypeArguments.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/extract-app3.xbgf b/topics/java/lci/xbgf/extract-app3.xbgf
index 95e08150..274d020a 100644
--- a/topics/java/lci/xbgf/extract-app3.xbgf
+++ b/topics/java/lci/xbgf/extract-app3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -37,4 +38,4 @@
     </bgf:production>
   </xbgf:extract>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/generalize-app3.xbgf b/topics/java/lci/xbgf/generalize-app3.xbgf
index 9e94c498..860643ab 100644
--- a/topics/java/lci/xbgf/generalize-app3.xbgf
+++ b/topics/java/lci/xbgf/generalize-app3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -95,4 +96,4 @@ Later should be a massage (AB|AB?)->AB?
     </bgf:expression>
   </xbgf:massage>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/generalizeBlock.xbgf b/topics/java/lci/xbgf/generalizeBlock.xbgf
index c3b70ec7..43058eed 100644
--- a/topics/java/lci/xbgf/generalizeBlock.xbgf
+++ b/topics/java/lci/xbgf/generalizeBlock.xbgf
@@ -1,23 +1,24 @@
-<xbgf:sequence
-  xmlns:bgf="http://planet-sl.org/bgf"
-  xmlns:xbgf="http://planet-sl.org/xbgf">
-
-  <!-- ISSUE CORRECT
-  - Fail: MethodBody.
-      - [], ;([n(Block), t((;))])
-     vs.
-      - [], n(Block)
-  -->
-  <!-- CORRECTION -->
-  <xbgf:add>
-    <vertical>
-      <bgf:production>
-        <nonterminal>MethodBody</nonterminal>
-        <bgf:expression>
-          <terminal>;</terminal>
-        </bgf:expression>
-      </bgf:production>
-    </vertical>
-  </xbgf:add>
-  
-</xbgf:sequence>
+<?xml version="1.0" encoding="utf-8"?>
+<xbgf:sequence
+  xmlns:bgf="http://planet-sl.org/bgf"
+  xmlns:xbgf="http://planet-sl.org/xbgf">
+
+  <!-- ISSUE CORRECT
+  - Fail: MethodBody.
+      - [], ;([n(Block), t((;))])
+     vs.
+      - [], n(Block)
+  -->
+  <!-- CORRECTION -->
+  <xbgf:add>
+    <vertical>
+      <bgf:production>
+        <nonterminal>MethodBody</nonterminal>
+        <bgf:expression>
+          <terminal>;</terminal>
+        </bgf:expression>
+      </bgf:production>
+    </vertical>
+  </xbgf:add>
+
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/generalizeLabels.xbgf b/topics/java/lci/xbgf/generalizeLabels.xbgf
index f62ebab7..624ab543 100644
--- a/topics/java/lci/xbgf/generalizeLabels.xbgf
+++ b/topics/java/lci/xbgf/generalizeLabels.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -31,5 +32,5 @@
       </bgf:expression>
     </xbgf:widen>
   </xbgf:atomic>
- 
+
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/generalizeModifiers-doc1.xbgf b/topics/java/lci/xbgf/generalizeModifiers-doc1.xbgf
index 32ca096b..b4f7e3ba 100644
--- a/topics/java/lci/xbgf/generalizeModifiers-doc1.xbgf
+++ b/topics/java/lci/xbgf/generalizeModifiers-doc1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/generalizeModifiers-doc2.xbgf b/topics/java/lci/xbgf/generalizeModifiers-doc2.xbgf
index aa8c3809..bfe9774e 100644
--- a/topics/java/lci/xbgf/generalizeModifiers-doc2.xbgf
+++ b/topics/java/lci/xbgf/generalizeModifiers-doc2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/generalizeModifiers-doc3.xbgf b/topics/java/lci/xbgf/generalizeModifiers-doc3.xbgf
index b7d98da6..8c271e5c 100644
--- a/topics/java/lci/xbgf/generalizeModifiers-doc3.xbgf
+++ b/topics/java/lci/xbgf/generalizeModifiers-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/generalizeNames-doc1.xbgf b/topics/java/lci/xbgf/generalizeNames-doc1.xbgf
index 0205bc9c..c8f1f539 100644
--- a/topics/java/lci/xbgf/generalizeNames-doc1.xbgf
+++ b/topics/java/lci/xbgf/generalizeNames-doc1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -28,7 +29,7 @@ vs
      Identifier { "." Identifier }
   
   -->
-  
+
   <!-- ISSUE PERMISSIVENESS -->
   <!-- RELAXATION -->
   <xbgf:unite>
@@ -50,7 +51,7 @@ vs
     <add>ExpressionName</add>
     <to>Name</to>
   </xbgf:unite>
-  
+
   <xbgf:deyaccify>Name</xbgf:deyaccify>
 
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/generalizeNames.xbgf b/topics/java/lci/xbgf/generalizeNames.xbgf
index a0dbadd7..bbe90e38 100644
--- a/topics/java/lci/xbgf/generalizeNames.xbgf
+++ b/topics/java/lci/xbgf/generalizeNames.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -28,7 +29,7 @@ vs
      Identifier { "." Identifier }
   
   -->
-  
+
   <!-- ISSUE PERMISSIVENESS -->
   <!-- RELAXATION -->
   <xbgf:unite>
@@ -62,5 +63,5 @@ vs
   </xbgf:unite>
 
   <xbgf:deyaccify>QualifiedIdentifier</xbgf:deyaccify>
-  
+
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/generalizeStatements.xbgf b/topics/java/lci/xbgf/generalizeStatements.xbgf
index 993c23bf..e3f9d197 100644
--- a/topics/java/lci/xbgf/generalizeStatements.xbgf
+++ b/topics/java/lci/xbgf/generalizeStatements.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/inlineForStatement.xbgf b/topics/java/lci/xbgf/inlineForStatement.xbgf
index d4089c79..33d0f587 100644
--- a/topics/java/lci/xbgf/inlineForStatement.xbgf
+++ b/topics/java/lci/xbgf/inlineForStatement.xbgf
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
   <!-- should be a part of inlineStatements, actually, but needed only for doc3 -->
   <xbgf:horizontal>ForStatement</xbgf:horizontal>
-  
-</xbgf:sequence>
+
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/inlineStatements.xbgf b/topics/java/lci/xbgf/inlineStatements.xbgf
index 61391ae6..b8239e3a 100644
--- a/topics/java/lci/xbgf/inlineStatements.xbgf
+++ b/topics/java/lci/xbgf/inlineStatements.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/recover-app3.xbgf b/topics/java/lci/xbgf/recover-app3.xbgf
index 60c82d0c..2116bcfb 100644
--- a/topics/java/lci/xbgf/recover-app3.xbgf
+++ b/topics/java/lci/xbgf/recover-app3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/recover-doc2.xbgf b/topics/java/lci/xbgf/recover-doc2.xbgf
index d2784601..da5a0c8d 100644
--- a/topics/java/lci/xbgf/recover-doc2.xbgf
+++ b/topics/java/lci/xbgf/recover-doc2.xbgf
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  
+
   <!--  ISSUE EXTRACTERROR
   Error in markup of JLS2
      - Fail: InterfaceBody.
@@ -33,7 +34,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:redefine>
-  
+
   <!-- ISSUE EXTRACTERROR
    Error in markup of JLS2
      - Fail: ClassBody.
@@ -65,7 +66,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:redefine>
-  
+
   <!-- ISSUE EXTRACTERROR
   Error in markup in JLS2
   
@@ -134,7 +135,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:redefine>
-  
+
   <!-- ISSUE EXTRACTERROR
      - Fail: SwitchBlock.
       - [], ,([t({), ?(n(SwitchBlockStatementGroups)), ?(n(SwitchLabels)), t(})])
@@ -172,7 +173,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:redefine>
-  
+
   <!-- ISSUE EXTRACTERROR
      - Fail: ConstructorBody.
       - [], ,([t({), ?(n(ExplicitConstructorInvocation)), ?(n(BlockStatements)), t(})])
@@ -210,7 +211,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:redefine>
-  
+
   <!-- ISSUE EXTRACTERROR
   Error in PrimaryNoNewArray undetected by the extractor due to lacking definition -->
   <!-- REVISE -->
diff --git a/topics/java/lci/xbgf/recover-doc3.xbgf b/topics/java/lci/xbgf/recover-doc3.xbgf
index 306ea0d6..87fdff41 100644
--- a/topics/java/lci/xbgf/recover-doc3.xbgf
+++ b/topics/java/lci/xbgf/recover-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -72,7 +73,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:redefine>
-  
+
   <!-- ISSUE EXTRACTERROR
   Extractor error:
    - Fail: ElementValueArrayInitializer.
@@ -111,7 +112,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:redefine>
-  
+
   <!-- ISSUE EXTRACTERROR
   extractor's problem -->
   <!-- REVISE -->
diff --git a/topics/java/lci/xbgf/refactor-app1.xbgf b/topics/java/lci/xbgf/refactor-app1.xbgf
index 0e4ad507..27530059 100644
--- a/topics/java/lci/xbgf/refactor-app1.xbgf
+++ b/topics/java/lci/xbgf/refactor-app1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -12,4 +13,4 @@
   <xbgf:inline>QualifiedName</xbgf:inline>
   <xbgf:deyaccify>Name</xbgf:deyaccify>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactor-app2.xbgf b/topics/java/lci/xbgf/refactor-app2.xbgf
index 4d7056d9..4003ad90 100644
--- a/topics/java/lci/xbgf/refactor-app2.xbgf
+++ b/topics/java/lci/xbgf/refactor-app2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -54,7 +55,7 @@
       <nonterminal>Expression3</nonterminal>
     </xbgf:vertical>
   </xbgf:atomic>
-  
+
   <!-- pushing optionals outside -->
   <xbgf:atomic>
     <xbgf:inline>Expression1Rest</xbgf:inline>
@@ -80,7 +81,7 @@
       </bgf:production>
     </xbgf:extract>
   </xbgf:atomic>
-  
+
   <xbgf:massage>
     <bgf:expression>
       <optional>
@@ -104,7 +105,7 @@
 
   <xbgf:horizontal>MemberDecl</xbgf:horizontal>
   <xbgf:inline>MemberDecl</xbgf:inline>
-<!--  <xbgf:distribute>
+  <!--  <xbgf:distribute>
     <nonterminal>ClassBodyDeclaration</nonterminal>
   </xbgf:distribute>
   <xbgf:vertical>
@@ -122,5 +123,4 @@
     <nonterminal>ParExpression</nonterminal>
   </xbgf:fold>
 
-
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactor-app3.xbgf b/topics/java/lci/xbgf/refactor-app3.xbgf
index 9ef83f88..f5c4ab15 100644
--- a/topics/java/lci/xbgf/refactor-app3.xbgf
+++ b/topics/java/lci/xbgf/refactor-app3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -104,8 +105,8 @@
     </bgf:expression>
   </xbgf:replace>
   <xbgf:eliminate>Selector</xbgf:eliminate>
-  
-  
+
+
   <!-- we don't need minimised lookahead here -->
   <xbgf:horizontal>InterfaceMemberDecl</xbgf:horizontal>
   <xbgf:inline>InterfaceMemberDecl</xbgf:inline>
@@ -122,8 +123,8 @@
   <xbgf:distribute>
     <nonterminal>InterfaceBodyDeclaration</nonterminal>
   </xbgf:distribute>
-<!--remove when done-->
+  <!--remove when done-->
   <xbgf:vertical>
     <nonterminal>InterfaceBodyDeclaration</nonterminal>
   </xbgf:vertical>
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactor-doc1.xbgf b/topics/java/lci/xbgf/refactor-doc1.xbgf
index da05f6a0..7d6b7fa3 100644
--- a/topics/java/lci/xbgf/refactor-doc1.xbgf
+++ b/topics/java/lci/xbgf/refactor-doc1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/refactorClasses-doc2.xbgf b/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
index c1625ae8..c6d05e7a 100644
--- a/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/refactorClasses-doc3.xbgf b/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
index 126de343..5f510d47 100644
--- a/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -227,7 +228,7 @@
     </bgf:production>
   </xbgf:appear>
   <xbgf:horizontal>ClassMemberDeclaration</xbgf:horizontal>
-  
+
   <!-- 
    - Fail: NormalClassDeclaration.
       - [], ,([t(class), n(Identifier), ?(,([t(extends), n(Type)])), ?(,([t(implements), n(TypeList)])), n(ClassBody)])
@@ -581,4 +582,4 @@
     </in>
   </xbgf:extract>
 
- </xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactorDeclarations-doc2.xbgf b/topics/java/lci/xbgf/refactorDeclarations-doc2.xbgf
index caf9558c..ddf95ed4 100644
--- a/topics/java/lci/xbgf/refactorDeclarations-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorDeclarations-doc2.xbgf
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
   <xbgf:deyaccify>VariableDeclarators</xbgf:deyaccify>
-  
+
   <!-- 
    - Fail: VariableDeclarator.
       - [], ,([n(Identifier), n(VariableDeclaratorRest)])
@@ -128,7 +129,7 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:extract>
-  
+
   <!-- 
    - Fail: CompilationUnit.
       - [], ,([?(,([t(package), n(QualifiedIdentifier), t((;))])), *(n(ImportDeclaration)), *(n(TypeDeclaration))])
@@ -189,7 +190,7 @@
   -->
   <xbgf:inline>SingleTypeImportDeclaration</xbgf:inline>
   <xbgf:inline>TypeImportOnDemandDeclaration</xbgf:inline>
-  
+
   <!-- 
    - Fail: ImportDeclaration.
       - [], ,([t(import), n(QualifiedIdentifier), ?(,([t(.), t(*)])), t((;))])
diff --git a/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf b/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf
index 00e0581b..e31fbe4e 100644
--- a/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -1195,4 +1196,4 @@ AnnotationTypeElementRest:
   <xbgf:vertical>
     <nonterminal>AnnotationTypeElementRest</nonterminal>
   </xbgf:vertical>
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactorEnums.xbgf b/topics/java/lci/xbgf/refactorEnums.xbgf
index 22dedfc2..57fafd78 100644
--- a/topics/java/lci/xbgf/refactorEnums.xbgf
+++ b/topics/java/lci/xbgf/refactorEnums.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -16,7 +17,7 @@
   EnumBodyDeclarations is defined as:
      ";" [ ClassBodyDeclarations ]
   -->
-  
+
   <!-- 
    - Fail: Arguments.
       - [], ,([t((), ?(,([n(Expression), *(,([t((,)), n(Expression)]))])), t())])
@@ -25,7 +26,7 @@
   -->
   <xbgf:deyaccify>ArgumentList</xbgf:deyaccify>
   <xbgf:inline>ArgumentList</xbgf:inline>
-  
+
   <!-- 
   - Fail: EnumDeclaration.
       - [], ,([t(enum), n(Identifier), ?(,([t(implements), n(TypeList)])), n(EnumBody)])
diff --git a/topics/java/lci/xbgf/refactorExpressions.xbgf b/topics/java/lci/xbgf/refactorExpressions.xbgf
index 4a9c895d..3e596338 100644
--- a/topics/java/lci/xbgf/refactorExpressions.xbgf
+++ b/topics/java/lci/xbgf/refactorExpressions.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf b/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf
index 2afef5df..bf0b1773 100644
--- a/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -121,7 +122,7 @@
   -->
   <xbgf:deyaccify>InterfaceMemberDeclarations</xbgf:deyaccify>
   <xbgf:inline>InterfaceMemberDeclarations</xbgf:inline>
-   <xbgf:massage>
+  <xbgf:massage>
     <bgf:expression>
       <optional>
         <bgf:expression>
@@ -433,7 +434,7 @@
 
   </xbgf:atomic>
 
- <!--
+  <!--
    - Fail: InterfaceMethodOrFieldRest.
       - [], ;([,([n(ConstantDeclaratorsRest), t((;))]), n(InterfaceMethodDeclaratorRest)])
      vs.
diff --git a/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf b/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf
index 56530311..ae6d9e2d 100644
--- a/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorInterfaces-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -171,7 +172,7 @@
   -->
   <xbgf:deyaccify>InterfaceMemberDeclarations</xbgf:deyaccify>
   <xbgf:inline>InterfaceMemberDeclarations</xbgf:inline>
-   <xbgf:massage>
+  <xbgf:massage>
     <bgf:expression>
       <optional>
         <bgf:expression>
diff --git a/topics/java/lci/xbgf/refactorMinorMismatches.xbgf b/topics/java/lci/xbgf/refactorMinorMismatches.xbgf
index af8bf7f9..95981073 100644
--- a/topics/java/lci/xbgf/refactorMinorMismatches.xbgf
+++ b/topics/java/lci/xbgf/refactorMinorMismatches.xbgf
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
-<!--
+  <!--
    - Fail (1/2): Statement.
       - [], ,([t(try), n(Block), ;([n(Catches), ,([?(n(Catches)), t(finally), n(Block)])])])
      vs.
@@ -52,46 +53,46 @@
           </bgf:expression>
         </choice>
       </bgf:expression>
+      <bgf:expression>
+        <sequence>
           <bgf:expression>
-            <sequence>
-              <bgf:expression>
-                <terminal>try</terminal>
-              </bgf:expression>
-              <bgf:expression>
-                <nonterminal>Block</nonterminal>
-              </bgf:expression>
+            <terminal>try</terminal>
+          </bgf:expression>
+          <bgf:expression>
+            <nonterminal>Block</nonterminal>
+          </bgf:expression>
+          <bgf:expression>
+            <choice>
               <bgf:expression>
-                <choice>
+                <sequence>
                   <bgf:expression>
-                    <sequence>
+                    <optional>
                       <bgf:expression>
-                        <optional>
-                          <bgf:expression>
-                            <nonterminal>Catches</nonterminal>
-                          </bgf:expression>
-                        </optional>
+                        <nonterminal>Catches</nonterminal>
                       </bgf:expression>
-                      <bgf:expression>
-                        <terminal>finally</terminal>
-                      </bgf:expression>
-                      <bgf:expression>
-                        <nonterminal>Block</nonterminal>
-                      </bgf:expression>
-                    </sequence>
+                    </optional>
                   </bgf:expression>
                   <bgf:expression>
-                    <nonterminal>Catches</nonterminal>
+                    <terminal>finally</terminal>
+                  </bgf:expression>
+                  <bgf:expression>
+                    <nonterminal>Block</nonterminal>
                   </bgf:expression>
-                </choice>
+                </sequence>
               </bgf:expression>
-            </sequence>
+              <bgf:expression>
+                <nonterminal>Catches</nonterminal>
+              </bgf:expression>
+            </choice>
           </bgf:expression>
+        </sequence>
+      </bgf:expression>
     </xbgf:factor>
     <xbgf:vertical>
       <nonterminal>Statement</nonterminal>
     </xbgf:vertical>
   </xbgf:atomic>
-  
+
   <!--
    - Fail (1/4): ClassBodyDeclaration.
       - [], ,([n(ModifiersOpt), ;([n(MethodOrFieldDecl), ,([t(void), n(Identifier), n(MethodDeclaratorRest)]), ,([n(Identifier), n(ConstructorDeclaratorRest)]), n(ClassOrInterfaceDeclaration)])])
@@ -202,4 +203,4 @@
       <nonterminal>ClassBodyDeclaration</nonterminal>
     </xbgf:vertical>
   </xbgf:atomic>
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactorPackageNames.xbgf b/topics/java/lci/xbgf/refactorPackageNames.xbgf
index 91b81e05..468ff4f1 100644
--- a/topics/java/lci/xbgf/refactorPackageNames.xbgf
+++ b/topics/java/lci/xbgf/refactorPackageNames.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -5,4 +6,4 @@
   <xbgf:deyaccify>PackageName</xbgf:deyaccify>
   <xbgf:deyaccify>PackageOrTypeName</xbgf:deyaccify>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactorStatements-doc3.xbgf b/topics/java/lci/xbgf/refactorStatements-doc3.xbgf
index 75825586..0d597e99 100644
--- a/topics/java/lci/xbgf/refactorStatements-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorStatements-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/refactorStatements-jls1.xbgf b/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
index cb45670e..ef9f640a 100644
--- a/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
+++ b/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -613,4 +614,4 @@
     </bgf:production>
   </xbgf:extract>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactorTypes-doc2.xbgf b/topics/java/lci/xbgf/refactorTypes-doc2.xbgf
index dc49c9f8..2f523025 100644
--- a/topics/java/lci/xbgf/refactorTypes-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes-doc2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -475,7 +476,7 @@
     <to>TypeList</to>
   </xbgf:unite>
   <xbgf:deyaccify>TypeList</xbgf:deyaccify>
-  
+
   <!-- Introducing brackets brutally, too hard to derive -->
   <!-- RELAXATION -->
   <xbgf:appear>
@@ -527,9 +528,9 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:extract>
-  
+
   <!-- Finishing touches -->
   <xbgf:inline>ClassOrInterfaceType</xbgf:inline>
   <xbgf:inline>ClassType</xbgf:inline>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactorTypes-doc3.xbgf b/topics/java/lci/xbgf/refactorTypes-doc3.xbgf
index 0efcd4fd..058b78c3 100644
--- a/topics/java/lci/xbgf/refactorTypes-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -1037,7 +1038,7 @@ TypeArgument:
       </sequence>
     </bgf:expression>
   </xbgf:factor>
-  
+
   <xbgf:inline>ActualTypeArgumentList</xbgf:inline>
 
   <!-- ...the story of BracketsOpt is continued in refactorExpressions-doc3 -->
diff --git a/topics/java/lci/xbgf/refactorTypes-jls1.xbgf b/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
index 909ea923..52cb5856 100644
--- a/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -304,4 +305,4 @@
     </in>
   </xbgf:fold>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/relaxClasses-doc3.xbgf b/topics/java/lci/xbgf/relaxClasses-doc3.xbgf
index 54ae8cd9..c8687995 100644
--- a/topics/java/lci/xbgf/relaxClasses-doc3.xbgf
+++ b/topics/java/lci/xbgf/relaxClasses-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -690,4 +691,4 @@ Block:
     <nonterminal>ModifiersOpt</nonterminal>
   </xbgf:fold>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/relaxExpressions-doc3.xbgf b/topics/java/lci/xbgf/relaxExpressions-doc3.xbgf
index 267569bb..e40e483a 100644
--- a/topics/java/lci/xbgf/relaxExpressions-doc3.xbgf
+++ b/topics/java/lci/xbgf/relaxExpressions-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -117,54 +118,54 @@
   <!-- ISSUE PERMISSIVENESS
   Everything that can be united to make Expression2 -->
   <xbgf:atomic>
-	<!-- RELAXATION -->
+    <!-- RELAXATION -->
     <xbgf:unite>
       <add>ConditionalAndExpression</add>
       <to>Expression2</to>
     </xbgf:unite>
-	<!-- RELAXATION -->
+    <!-- RELAXATION -->
     <xbgf:unite>
       <add>InclusiveOrExpression</add>
       <to>Expression2</to>
     </xbgf:unite>
-	<!-- RELAXATION -->
+    <!-- RELAXATION -->
     <xbgf:unite>
       <add>ExclusiveOrExpression</add>
       <to>Expression2</to>
     </xbgf:unite>
-	<!-- RELAXATION -->
+    <!-- RELAXATION -->
     <xbgf:unite>
       <add>AndExpression</add>
       <to>Expression2</to>
     </xbgf:unite>
-	<!-- RELAXATION -->
+    <!-- RELAXATION -->
     <xbgf:unite>
       <add>EqualityExpression</add>
       <to>Expression2</to>
     </xbgf:unite>
-	<!-- RELAXATION -->
+    <!-- RELAXATION -->
     <xbgf:unite>
       <add>RelationalExpression</add>
       <to>Expression2</to>
     </xbgf:unite>
-	<!-- RELAXATION -->
+    <!-- RELAXATION -->
     <xbgf:unite>
       <add>ShiftExpression</add>
       <to>Expression2</to>
     </xbgf:unite>
-	<!-- RELAXATION -->
+    <!-- RELAXATION -->
     <xbgf:unite>
       <add>AdditiveExpression</add>
       <to>Expression2</to>
     </xbgf:unite>
-	<!-- RELAXATION -->
+    <!-- RELAXATION -->
     <xbgf:unite>
       <add>MultiplicativeExpression</add>
       <to>Expression2</to>
     </xbgf:unite>
     <xbgf:horizontal>Expression2</xbgf:horizontal>
   </xbgf:atomic>
-  
+
   <!-- Introducing another layering scheme: Expression3 -->
   <!-- GENERALITY -->
   <!-- RELAXATION -->
@@ -1256,7 +1257,7 @@
   <xbgf:distribute>
     <nonterminal>Assignment</nonterminal>
   </xbgf:distribute>
-   <xbgf:vertical>
+  <xbgf:vertical>
     <nonterminal>Assignment</nonterminal>
   </xbgf:vertical>
   <xbgf:deyaccify>Assignment</xbgf:deyaccify>
@@ -1301,7 +1302,7 @@
     </xbgf:massage>
     <xbgf:inline>TMP</xbgf:inline>
   </xbgf:atomic>
-  
+
   <!-- replacing LeftHandSide by Expression1 in Assignment -->
   <!-- RELAXATION -->
   <xbgf:downgrade>
@@ -1351,8 +1352,8 @@
               <bgf:expression>
                 <sequence>
                   <bgf:expression>
-                        <nonterminal>QualifiedIdentifier</nonterminal>
-                      </bgf:expression>
+                    <nonterminal>QualifiedIdentifier</nonterminal>
+                  </bgf:expression>
                   <bgf:expression>
                     <marked>
                       <bgf:expression>
@@ -1390,7 +1391,8 @@
                 <bgf:expression>
                   <sequence>
                     <bgf:expression>
-                      <choice><bgf:expression>
+                      <choice>
+                        <bgf:expression>
                           <nonterminal>QualifiedIdentifier</nonterminal>
                         </bgf:expression>
                         <bgf:expression>
@@ -1408,7 +1410,8 @@
                           <nonterminal>PostfixOp</nonterminal>
                         </bgf:expression>
                       </star>
-                    </bgf:expression>                    <bgf:expression>
+                    </bgf:expression>
+                    <bgf:expression>
                       <nonterminal>AssignmentOperator</nonterminal>
                     </bgf:expression>
                   </sequence>
@@ -1475,7 +1478,8 @@
             </star>
           </bgf:expression>
         </sequence>
-      </bgf:expression>    </bgf:production>
+      </bgf:expression>
+    </bgf:production>
   </xbgf:upgrade>
   <!-- RELAXATION -->
   <xbgf:appear>
@@ -1488,7 +1492,7 @@
               <bgf:expression>
                 <sequence>
                   <bgf:expression>
-                        <nonterminal>Expression3</nonterminal>
+                    <nonterminal>Expression3</nonterminal>
                   </bgf:expression>
                   <bgf:expression>
                     <marked>
@@ -1553,11 +1557,11 @@
             <nonterminal>Expression3</nonterminal>
           </bgf:expression>
           <bgf:expression>
-                <optional>
-                  <bgf:expression>
-                    <nonterminal>Expression2Rest</nonterminal>
-                  </bgf:expression>
-                </optional>
+            <optional>
+              <bgf:expression>
+                <nonterminal>Expression2Rest</nonterminal>
+              </bgf:expression>
+            </optional>
           </bgf:expression>
         </sequence>
       </bgf:expression>
@@ -1650,7 +1654,7 @@
     </bgf:production>
   </xbgf:upgrade>
   <!-- end of "replace" -->
-  
+
   <xbgf:inline>Assignment</xbgf:inline>
   <xbgf:eliminate>LeftHandSide</xbgf:eliminate>
   <xbgf:factor>
@@ -1806,5 +1810,5 @@
       <nonterminal>Expression</nonterminal>
     </in>
   </xbgf:widen>
-    
-</xbgf:sequence>
+
+</xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/rename-app1.xbgf b/topics/java/lci/xbgf/rename-app1.xbgf
index de4c48d9..2d4888d5 100644
--- a/topics/java/lci/xbgf/rename-app1.xbgf
+++ b/topics/java/lci/xbgf/rename-app1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/rename-doc1.xbgf b/topics/java/lci/xbgf/rename-doc1.xbgf
index 7aac0c5d..23c8be95 100644
--- a/topics/java/lci/xbgf/rename-doc1.xbgf
+++ b/topics/java/lci/xbgf/rename-doc1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -15,7 +16,7 @@
       <to>Modifiers</to>
     </nonterminal>
   </xbgf:rename>
-  
+
   <!-- followed by unites in generalizeNames -->
   <xbgf:rename>
     <nonterminal>
diff --git a/topics/java/lci/xbgf/rename-doc12.xbgf b/topics/java/lci/xbgf/rename-doc12.xbgf
index 5a5e9097..01b9ee33 100644
--- a/topics/java/lci/xbgf/rename-doc12.xbgf
+++ b/topics/java/lci/xbgf/rename-doc12.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/rename-doc2.xbgf b/topics/java/lci/xbgf/rename-doc2.xbgf
index ec30e405..10312b04 100644
--- a/topics/java/lci/xbgf/rename-doc2.xbgf
+++ b/topics/java/lci/xbgf/rename-doc2.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -23,7 +24,7 @@
       <to>QualifiedIdentifier</to>
     </nonterminal>
   </xbgf:rename>
-  
+
   <!-- unites in refactorTypes -->
   <xbgf:rename>
     <nonterminal>
@@ -65,5 +66,5 @@
       <to>InterfaceBodyDeclaration</to>
     </nonterminal>
   </xbgf:rename>
-  
+
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/rename-doc3.xbgf b/topics/java/lci/xbgf/rename-doc3.xbgf
index 17843389..d0f7fbe2 100644
--- a/topics/java/lci/xbgf/rename-doc3.xbgf
+++ b/topics/java/lci/xbgf/rename-doc3.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
@@ -63,7 +64,7 @@
       <to>Expression3</to>
     </nonterminal>
   </xbgf:rename>
-  
+
   <!-- needed for refactorInterfaces -->
   <xbgf:rename>
     <nonterminal>
diff --git a/topics/java/lci/xbgf/rename-jls1.xbgf b/topics/java/lci/xbgf/rename-jls1.xbgf
index 2d54a3ff..f3d5436d 100644
--- a/topics/java/lci/xbgf/rename-jls1.xbgf
+++ b/topics/java/lci/xbgf/rename-jls1.xbgf
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
diff --git a/topics/java/lci/xbgf/rename-jls12.xbgf b/topics/java/lci/xbgf/rename-jls12.xbgf
index 40e48d40..53e729d0 100644
--- a/topics/java/lci/xbgf/rename-jls12.xbgf
+++ b/topics/java/lci/xbgf/rename-jls12.xbgf
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <xbgf:sequence
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf">
-  
+
   <xbgf:rename>
     <nonterminal>
       <from>Infixop</from>
@@ -17,4 +17,4 @@
     </nonterminal>
   </xbgf:rename>
 
-</xbgf:sequence>
+</xbgf:sequence>
\ No newline at end of file