diff --git a/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java b/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java
index 5dfa2cec56a25b4cbd219525f7e235f7811fe7dd..d4bdef14fe29e10118dbf1b215223425c61fb728 100644
--- a/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java
+++ b/src/main/java/org/sablecc/sablecc/analysis/AnalysisAdapter.java
@@ -529,7 +529,5 @@ public class AnalysisAdapter implements Analysis
     }
 
     public void defaultCase(Node node)
-    {
-        // do nothing
-    }
+    {}
 }
diff --git a/src/main/java/org/sablecc/sablecc/analysis/DepthFirstAdapter.java b/src/main/java/org/sablecc/sablecc/analysis/DepthFirstAdapter.java
index 7132e6efa4369f2ac32663be65aa9a6cdb3cbc79..bc1528069f859b93c9be5bd5bfcff8a0bc87f672 100644
--- a/src/main/java/org/sablecc/sablecc/analysis/DepthFirstAdapter.java
+++ b/src/main/java/org/sablecc/sablecc/analysis/DepthFirstAdapter.java
@@ -20,14 +20,10 @@ public class DepthFirstAdapter extends AnalysisAdapter
     }
 
     public void defaultIn(Node node)
-    {
-        // Do nothing
-    }
+    {}
 
     public void defaultOut(Node node)
-    {
-        // Do nothing
-    }
+    {}
 
     @Override
     public void caseStart(Start node)
diff --git a/src/main/java/org/sablecc/sablecc/analysis/ReversedDepthFirstAdapter.java b/src/main/java/org/sablecc/sablecc/analysis/ReversedDepthFirstAdapter.java
index 3f75d98fdf099be198e5d7af5da0ce395527916f..6ff1e7d4bdbefb2f1f898596bb0fec429a11e86d 100644
--- a/src/main/java/org/sablecc/sablecc/analysis/ReversedDepthFirstAdapter.java
+++ b/src/main/java/org/sablecc/sablecc/analysis/ReversedDepthFirstAdapter.java
@@ -21,14 +21,10 @@ public class ReversedDepthFirstAdapter extends AnalysisAdapter
     }
 
     public void defaultIn(Node node)
-    {
-        // Do nothing
-    }
+    {}
 
     public void defaultOut(Node node)
-    {
-        // Do nothing
-    }
+    {}
 
     @Override
     public void caseStart(Start node)
diff --git a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
index 2cd749cc272348c17de5a8071a0aeea4e9f4043b..be9622ad4ae79cc1b9f795441bed0c8036cff592 100644
--- a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
+++ b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
@@ -40,9 +40,7 @@ public class Lexer
     }
 
     protected void filter() throws LexerException, IOException
-    {
-        // Do nothing
-    }
+    {}
 
     /**
      * @deprecated Override {@link #filter()} instead.
diff --git a/src/main/java/org/sablecc/sablecc/node/AAlt.java b/src/main/java/org/sablecc/sablecc/node/AAlt.java
index 46fa13efb215524e39975d042ef80890130c29c6..868516db660840f4961534721cdb6c667a06f292 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAlt.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAlt.java
@@ -16,7 +16,6 @@ public final class AAlt extends PAlt
 
     public AAlt()
     {
-        // Constructor
     }
 
     public AAlt(
@@ -24,7 +23,6 @@ public final class AAlt extends PAlt
           List<PElem> _elems_,
           PAltTransform _altTransform_)
     {
-        // Constructor
         setAltName(_altName_);
 
         setElems(_elems_);
@@ -140,7 +138,6 @@ public final class AAlt extends PAlt
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._altName_ == child)
         {
             this._altName_ = null;
@@ -164,7 +161,6 @@ public final class AAlt extends PAlt
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._altName_ == oldChild)
         {
             setAltName((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AAltTransform.java b/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
index 40ae9973af24d27c45cd43fc02484dba18b09bbf..7a3711c2763428503b8dfce8a405def437f3d12a 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
@@ -16,7 +16,6 @@ public final class AAltTransform extends PAltTransform
 
     public AAltTransform()
     {
-        // Constructor
     }
 
     public AAltTransform(
@@ -24,7 +23,6 @@ public final class AAltTransform extends PAltTransform
           List<PTerm> _terms_,
           TRBrace _rBrace_)
     {
-        // Constructor
         setLBrace(_lBrace_);
 
         setTerms(_terms_);
@@ -140,7 +138,6 @@ public final class AAltTransform extends PAltTransform
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._lBrace_ == child)
         {
             this._lBrace_ = null;
@@ -164,7 +161,6 @@ public final class AAltTransform extends PAltTransform
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._lBrace_ == oldChild)
         {
             setLBrace((TLBrace) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AAst.java b/src/main/java/org/sablecc/sablecc/node/AAst.java
index 82a3c2876bc2907d96d2f6ffbdf1d0190e02adad..a0c94e04769204e21d4711f807a0ee2dec0a3232 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAst.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAst.java
@@ -14,13 +14,11 @@ public final class AAst extends PAst
 
     public AAst()
     {
-        // Constructor
     }
 
     public AAst(
           List<PAstProd> _prods_)
     {
-        // Constructor
         setProds(_prods_);
 
     }
@@ -78,7 +76,6 @@ public final class AAst extends PAst
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._prods_.remove(child))
         {
             return;
@@ -90,7 +87,6 @@ public final class AAst extends PAst
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         for(ListIterator<PAstProd> i = this._prods_.listIterator(); i.hasNext();)
         {
             if(i.next() == oldChild)
diff --git a/src/main/java/org/sablecc/sablecc/node/AAstAlt.java b/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
index 57f8d822fb9c402b9490579d65dc7194b95e2307..e08e5cf0de0682419983a2b1d1202cf7e6e621f4 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
@@ -15,14 +15,12 @@ public final class AAstAlt extends PAstAlt
 
     public AAstAlt()
     {
-        // Constructor
     }
 
     public AAstAlt(
           TId _altName_,
           List<PElem> _elems_)
     {
-        // Constructor
         setAltName(_altName_);
 
         setElems(_elems_);
@@ -109,7 +107,6 @@ public final class AAstAlt extends PAstAlt
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._altName_ == child)
         {
             this._altName_ = null;
@@ -127,7 +124,6 @@ public final class AAstAlt extends PAstAlt
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._altName_ == oldChild)
         {
             setAltName((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AAstProd.java b/src/main/java/org/sablecc/sablecc/node/AAstProd.java
index 9548aa5c410d1b1c132f36901b7234623a328b9d..aaa856ecbdbe2f9eddd099795e7fe325e8ab6bb5 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAstProd.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAstProd.java
@@ -15,14 +15,12 @@ public final class AAstProd extends PAstProd
 
     public AAstProd()
     {
-        // Constructor
     }
 
     public AAstProd(
           TId _id_,
           List<PAstAlt> _alts_)
     {
-        // Constructor
         setId(_id_);
 
         setAlts(_alts_);
@@ -109,7 +107,6 @@ public final class AAstProd extends PAstProd
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._id_ == child)
         {
             this._id_ = null;
@@ -127,7 +124,6 @@ public final class AAstProd extends PAstProd
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._id_ == oldChild)
         {
             setId((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/ACharBasic.java b/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
index 270a06ccf7ec1b69314995cab75ce6f938004850..925d9381efda3224f099ffe40c66b535d3286644 100644
--- a/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
@@ -10,13 +10,11 @@ public final class ACharBasic extends PBasic
 
     public ACharBasic()
     {
-        // Constructor
     }
 
     public ACharBasic(
           PChar _char_)
     {
-        // Constructor
         setChar(_char_);
 
     }
@@ -74,7 +72,6 @@ public final class ACharBasic extends PBasic
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._char_ == child)
         {
             this._char_ = null;
@@ -87,7 +84,6 @@ public final class ACharBasic extends PBasic
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._char_ == oldChild)
         {
             setChar((PChar) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/ACharChar.java b/src/main/java/org/sablecc/sablecc/node/ACharChar.java
index 0b11b64769f5fa9c142f2706d4b42d6130475707..188050b861aa28e9180c78888efb583dd8620c6a 100644
--- a/src/main/java/org/sablecc/sablecc/node/ACharChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/ACharChar.java
@@ -10,13 +10,11 @@ public final class ACharChar extends PChar
 
     public ACharChar()
     {
-        // Constructor
     }
 
     public ACharChar(
           TChar _char_)
     {
-        // Constructor
         setChar(_char_);
 
     }
@@ -74,7 +72,6 @@ public final class ACharChar extends PChar
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._char_ == child)
         {
             this._char_ = null;
@@ -87,7 +84,6 @@ public final class ACharChar extends PChar
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._char_ == oldChild)
         {
             setChar((TChar) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AConcat.java b/src/main/java/org/sablecc/sablecc/node/AConcat.java
index 76b5d87780c0df49b870396a3c78d555b2416c69..1ade31e73081c3137f1b76b7c769fe4231b486df 100644
--- a/src/main/java/org/sablecc/sablecc/node/AConcat.java
+++ b/src/main/java/org/sablecc/sablecc/node/AConcat.java
@@ -14,13 +14,11 @@ public final class AConcat extends PConcat
 
     public AConcat()
     {
-        // Constructor
     }
 
     public AConcat(
           List<PUnExp> _unExps_)
     {
-        // Constructor
         setUnExps(_unExps_);
 
     }
@@ -78,7 +76,6 @@ public final class AConcat extends PConcat
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._unExps_.remove(child))
         {
             return;
@@ -90,7 +87,6 @@ public final class AConcat extends PConcat
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         for(ListIterator<PUnExp> i = this._unExps_.listIterator(); i.hasNext();)
         {
             if(i.next() == oldChild)
diff --git a/src/main/java/org/sablecc/sablecc/node/ADecChar.java b/src/main/java/org/sablecc/sablecc/node/ADecChar.java
index 0778ae0ddededaffc90e221f3fb7e95999f2522a..e2743bd85b4f1ceefe1ee8fc7bca2c2d9b0e7c20 100644
--- a/src/main/java/org/sablecc/sablecc/node/ADecChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/ADecChar.java
@@ -10,13 +10,11 @@ public final class ADecChar extends PChar
 
     public ADecChar()
     {
-        // Constructor
     }
 
     public ADecChar(
           TDecChar _decChar_)
     {
-        // Constructor
         setDecChar(_decChar_);
 
     }
@@ -74,7 +72,6 @@ public final class ADecChar extends PChar
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._decChar_ == child)
         {
             this._decChar_ = null;
@@ -87,7 +84,6 @@ public final class ADecChar extends PChar
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._decChar_ == oldChild)
         {
             setDecChar((TDecChar) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AElem.java b/src/main/java/org/sablecc/sablecc/node/AElem.java
index f961acc6ee47ccaf2b0f8321abaac9e5f086912a..ef1d47c784b0c8cc31c97a9436b07f4451cf766e 100644
--- a/src/main/java/org/sablecc/sablecc/node/AElem.java
+++ b/src/main/java/org/sablecc/sablecc/node/AElem.java
@@ -13,7 +13,6 @@ public final class AElem extends PElem
 
     public AElem()
     {
-        // Constructor
     }
 
     public AElem(
@@ -22,7 +21,6 @@ public final class AElem extends PElem
           TId _id_,
           PUnOp _unOp_)
     {
-        // Constructor
         setElemName(_elemName_);
 
         setSpecifier(_specifier_);
@@ -167,7 +165,6 @@ public final class AElem extends PElem
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._elemName_ == child)
         {
             this._elemName_ = null;
@@ -198,7 +195,6 @@ public final class AElem extends PElem
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._elemName_ == oldChild)
         {
             setElemName((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AGrammar.java b/src/main/java/org/sablecc/sablecc/node/AGrammar.java
index ef39aa3ef21844b05520fadbe17880fc8a2a9566..6a2cd2adaf77c3f47e0aec2b6c1c2518d4d8ca60 100644
--- a/src/main/java/org/sablecc/sablecc/node/AGrammar.java
+++ b/src/main/java/org/sablecc/sablecc/node/AGrammar.java
@@ -20,7 +20,6 @@ public final class AGrammar extends PGrammar
 
     public AGrammar()
     {
-        // Constructor
     }
 
     public AGrammar(
@@ -32,7 +31,6 @@ public final class AGrammar extends PGrammar
           PProductions _productions_,
           PAst _ast_)
     {
-        // Constructor
         setPackage(_package_);
 
         setHelpers(_helpers_);
@@ -264,7 +262,6 @@ public final class AGrammar extends PGrammar
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._package_.remove(child))
         {
             return;
@@ -312,7 +309,6 @@ public final class AGrammar extends PGrammar
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         for(ListIterator<TPkgId> i = this._package_.listIterator(); i.hasNext();)
         {
             if(i.next() == oldChild)
diff --git a/src/main/java/org/sablecc/sablecc/node/AHelperDef.java b/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
index 93742b973d0c4212ec8f6ede8ef1bb440714c74a..f19e5c7c146583b3dcd1c9cfe59e7e40f515f1b0 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
@@ -11,14 +11,12 @@ public final class AHelperDef extends PHelperDef
 
     public AHelperDef()
     {
-        // Constructor
     }
 
     public AHelperDef(
           TId _id_,
           PRegExp _regExp_)
     {
-        // Constructor
         setId(_id_);
 
         setRegExp(_regExp_);
@@ -105,7 +103,6 @@ public final class AHelperDef extends PHelperDef
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._id_ == child)
         {
             this._id_ = null;
@@ -124,7 +121,6 @@ public final class AHelperDef extends PHelperDef
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._id_ == oldChild)
         {
             setId((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AHelpers.java b/src/main/java/org/sablecc/sablecc/node/AHelpers.java
index f083aeccd7c11cb2ccae6722e3a713eb739de4fa..772d6b8b20974d2082367109c1e41c6cb6b053e8 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHelpers.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHelpers.java
@@ -14,13 +14,11 @@ public final class AHelpers extends PHelpers
 
     public AHelpers()
     {
-        // Constructor
     }
 
     public AHelpers(
           List<PHelperDef> _helperDefs_)
     {
-        // Constructor
         setHelperDefs(_helperDefs_);
 
     }
@@ -78,7 +76,6 @@ public final class AHelpers extends PHelpers
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._helperDefs_.remove(child))
         {
             return;
@@ -90,7 +87,6 @@ public final class AHelpers extends PHelpers
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         for(ListIterator<PHelperDef> i = this._helperDefs_.listIterator(); i.hasNext();)
         {
             if(i.next() == oldChild)
diff --git a/src/main/java/org/sablecc/sablecc/node/AHexChar.java b/src/main/java/org/sablecc/sablecc/node/AHexChar.java
index ea2c910d1d49ce0f9e927ca69e814ddf7c571c71..bde57e7bac6547a1b218db75d8d0cd8034554bed 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHexChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHexChar.java
@@ -10,13 +10,11 @@ public final class AHexChar extends PChar
 
     public AHexChar()
     {
-        // Constructor
     }
 
     public AHexChar(
           THexChar _hexChar_)
     {
-        // Constructor
         setHexChar(_hexChar_);
 
     }
@@ -74,7 +72,6 @@ public final class AHexChar extends PChar
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._hexChar_ == child)
         {
             this._hexChar_ = null;
@@ -87,7 +84,6 @@ public final class AHexChar extends PChar
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._hexChar_ == oldChild)
         {
             setHexChar((THexChar) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AIdBasic.java b/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
index 2089831188cb12dc623730ec625934679b13fe73..565e3200c6c0635c84a4f9db311fcede0765385a 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
@@ -10,13 +10,11 @@ public final class AIdBasic extends PBasic
 
     public AIdBasic()
     {
-        // Constructor
     }
 
     public AIdBasic(
           TId _id_)
     {
-        // Constructor
         setId(_id_);
 
     }
@@ -74,7 +72,6 @@ public final class AIdBasic extends PBasic
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._id_ == child)
         {
             this._id_ = null;
@@ -87,7 +84,6 @@ public final class AIdBasic extends PBasic
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._id_ == oldChild)
         {
             setId((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java b/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
index 21caa3f72801410e9ea8f11c13f0e983c8c985aa..5290ee25abbc2384b93ae9462882821d7e17cd95 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
@@ -14,13 +14,11 @@ public final class AIgnTokens extends PIgnTokens
 
     public AIgnTokens()
     {
-        // Constructor
     }
 
     public AIgnTokens(
           List<TId> _listId_)
     {
-        // Constructor
         setListId(_listId_);
 
     }
@@ -78,7 +76,6 @@ public final class AIgnTokens extends PIgnTokens
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._listId_.remove(child))
         {
             return;
@@ -90,7 +87,6 @@ public final class AIgnTokens extends PIgnTokens
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         for(ListIterator<TId> i = this._listId_.listIterator(); i.hasNext();)
         {
             if(i.next() == oldChild)
diff --git a/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java b/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
index aa6dcc6ab68b6d5744a714b694cef42c9855a0fb..9bff5aa293c556c43530f33f6cfcc8ce5a5f2706 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
@@ -11,14 +11,12 @@ public final class AIntervalSet extends PSet
 
     public AIntervalSet()
     {
-        // Constructor
     }
 
     public AIntervalSet(
           PChar _left_,
           PChar _right_)
     {
-        // Constructor
         setLeft(_left_);
 
         setRight(_right_);
@@ -105,7 +103,6 @@ public final class AIntervalSet extends PSet
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._left_ == child)
         {
             this._left_ = null;
@@ -124,7 +121,6 @@ public final class AIntervalSet extends PSet
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._left_ == oldChild)
         {
             setLeft((PChar) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AListTerm.java b/src/main/java/org/sablecc/sablecc/node/AListTerm.java
index d87e033f3da0e89daaac6f78d70067f30dfa5ac8..bfa2c59eb2bfbbe787c45463af461eb5cfa610e3 100644
--- a/src/main/java/org/sablecc/sablecc/node/AListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/AListTerm.java
@@ -15,14 +15,12 @@ public final class AListTerm extends PTerm
 
     public AListTerm()
     {
-        // Constructor
     }
 
     public AListTerm(
           TLBkt _lBkt_,
           List<PListTerm> _listTerms_)
     {
-        // Constructor
         setLBkt(_lBkt_);
 
         setListTerms(_listTerms_);
@@ -109,7 +107,6 @@ public final class AListTerm extends PTerm
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._lBkt_ == child)
         {
             this._lBkt_ = null;
@@ -127,7 +124,6 @@ public final class AListTerm extends PTerm
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._lBkt_ == oldChild)
         {
             setLBkt((TLBkt) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java b/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
index d707ff0d2662fa874328e8dc072c94d7f50c1c31..fd1e1e56a1d82345c9369931217712c53fa28e7a 100644
--- a/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
@@ -9,7 +9,6 @@ public final class AMinusBinOp extends PBinOp
 
     public AMinusBinOp()
     {
-        // Constructor
     }
 
     public AMinusBinOp(AMinusBinOp node)
@@ -38,14 +37,12 @@ public final class AMinusBinOp extends PBinOp
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         throw new RuntimeException("Not a child.");
     }
 
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         throw new RuntimeException("Not a child.");
     }
 }
diff --git a/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java b/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
index 0d3d8341d0b3d7c516dd49709a293b771b7f63a2..b2c151bba0d1456c1839bf556146b852fb8f9db0 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
@@ -16,7 +16,6 @@ public final class ANewListTerm extends PListTerm
 
     public ANewListTerm()
     {
-        // Constructor
     }
 
     public ANewListTerm(
@@ -24,7 +23,6 @@ public final class ANewListTerm extends PListTerm
           TLPar _lPar_,
           List<PTerm> _params_)
     {
-        // Constructor
         setProdName(_prodName_);
 
         setLPar(_lPar_);
@@ -140,7 +138,6 @@ public final class ANewListTerm extends PListTerm
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._prodName_ == child)
         {
             this._prodName_ = null;
@@ -164,7 +161,6 @@ public final class ANewListTerm extends PListTerm
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._prodName_ == oldChild)
         {
             setProdName((PProdName) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/ANewTerm.java b/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
index 601f7923f6c48099cb2e481e81967218c5febde1..4fb329bde1657a4b8a9dcc365ea68561c8049c1c 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
@@ -16,7 +16,6 @@ public final class ANewTerm extends PTerm
 
     public ANewTerm()
     {
-        // Constructor
     }
 
     public ANewTerm(
@@ -24,7 +23,6 @@ public final class ANewTerm extends PTerm
           TLPar _lPar_,
           List<PTerm> _params_)
     {
-        // Constructor
         setProdName(_prodName_);
 
         setLPar(_lPar_);
@@ -140,7 +138,6 @@ public final class ANewTerm extends PTerm
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._prodName_ == child)
         {
             this._prodName_ = null;
@@ -164,7 +161,6 @@ public final class ANewTerm extends PTerm
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._prodName_ == oldChild)
         {
             setProdName((PProdName) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/ANullTerm.java b/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
index dcd1f7f03016cf85edbe33a38932573e96e1328a..e5846fc1a9468177ecffc92d822f42b4f79f8ac0 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
@@ -9,7 +9,6 @@ public final class ANullTerm extends PTerm
 
     public ANullTerm()
     {
-        // Constructor
     }
 
     public ANullTerm(ANullTerm node)
@@ -38,14 +37,12 @@ public final class ANullTerm extends PTerm
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         throw new RuntimeException("Not a child.");
     }
 
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         throw new RuntimeException("Not a child.");
     }
 }
diff --git a/src/main/java/org/sablecc/sablecc/node/AOperationSet.java b/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
index 0cd95937a665df7a27df7e5732e06737ada2b682..fc8b1c38ab58ee68996bd669753c5c3d52f1b00e 100644
--- a/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
+++ b/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
@@ -12,7 +12,6 @@ public final class AOperationSet extends PSet
 
     public AOperationSet()
     {
-        // Constructor
     }
 
     public AOperationSet(
@@ -20,7 +19,6 @@ public final class AOperationSet extends PSet
           PBinOp _binOp_,
           PBasic _right_)
     {
-        // Constructor
         setLeft(_left_);
 
         setBinOp(_binOp_);
@@ -136,7 +134,6 @@ public final class AOperationSet extends PSet
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._left_ == child)
         {
             this._left_ = null;
@@ -161,7 +158,6 @@ public final class AOperationSet extends PSet
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._left_ == oldChild)
         {
             setLeft((PBasic) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java b/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
index 653ce61752c9e7dc3b91309ea7d3b7e1a9eba008..e7ac89e687070163a6398d5ccb52d2c318cf2a97 100644
--- a/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
@@ -9,7 +9,6 @@ public final class APlusBinOp extends PBinOp
 
     public APlusBinOp()
     {
-        // Constructor
     }
 
     public APlusBinOp(APlusBinOp node)
@@ -38,14 +37,12 @@ public final class APlusBinOp extends PBinOp
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         throw new RuntimeException("Not a child.");
     }
 
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         throw new RuntimeException("Not a child.");
     }
 }
diff --git a/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java b/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
index c18ef1bf8d4d78a3a2446c86fa48518a6df6995a..06e6fa7f89f0f0f5e0e463cbcf8d43c62a1d3e28 100644
--- a/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
@@ -10,13 +10,11 @@ public final class APlusUnOp extends PUnOp
 
     public APlusUnOp()
     {
-        // Constructor
     }
 
     public APlusUnOp(
           TPlus _plus_)
     {
-        // Constructor
         setPlus(_plus_);
 
     }
@@ -74,7 +72,6 @@ public final class APlusUnOp extends PUnOp
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._plus_ == child)
         {
             this._plus_ = null;
@@ -87,7 +84,6 @@ public final class APlusUnOp extends PUnOp
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._plus_ == oldChild)
         {
             setPlus((TPlus) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AProd.java b/src/main/java/org/sablecc/sablecc/node/AProd.java
index ffa7289bfcd677de1924216fcfefd6814d41f8aa..cd2f5039ba8ba6f5122d25bc152b4af7ab7a4d44 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProd.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProd.java
@@ -17,7 +17,6 @@ public final class AProd extends PProd
 
     public AProd()
     {
-        // Constructor
     }
 
     public AProd(
@@ -26,7 +25,6 @@ public final class AProd extends PProd
           List<PElem> _prodTransform_,
           List<PAlt> _alts_)
     {
-        // Constructor
         setId(_id_);
 
         setArrow(_arrow_);
@@ -171,7 +169,6 @@ public final class AProd extends PProd
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._id_ == child)
         {
             this._id_ = null;
@@ -200,7 +197,6 @@ public final class AProd extends PProd
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._id_ == oldChild)
         {
             setId((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AProdName.java b/src/main/java/org/sablecc/sablecc/node/AProdName.java
index f5be37eb0fc230b8a7f2e8ea97d6e1cab1659f59..a11a3803e86b1b8d6894da74c0163dd092f452f3 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProdName.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProdName.java
@@ -11,14 +11,12 @@ public final class AProdName extends PProdName
 
     public AProdName()
     {
-        // Constructor
     }
 
     public AProdName(
           TId _id_,
           TId _prodNameTail_)
     {
-        // Constructor
         setId(_id_);
 
         setProdNameTail(_prodNameTail_);
@@ -105,7 +103,6 @@ public final class AProdName extends PProdName
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._id_ == child)
         {
             this._id_ = null;
@@ -124,7 +121,6 @@ public final class AProdName extends PProdName
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._id_ == oldChild)
         {
             setId((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java b/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
index cccd16d36c56e44cec0f3b2f4e1d0c89f5ed859d..cd822a61eb245bbb9cfa679aba3ef760477fd790 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
@@ -9,7 +9,6 @@ public final class AProductionSpecifier extends PSpecifier
 
     public AProductionSpecifier()
     {
-        // Constructor
     }
 
     public AProductionSpecifier(AProductionSpecifier node)
@@ -38,14 +37,12 @@ public final class AProductionSpecifier extends PSpecifier
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         throw new RuntimeException("Not a child.");
     }
 
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         throw new RuntimeException("Not a child.");
     }
 }
diff --git a/src/main/java/org/sablecc/sablecc/node/AProductions.java b/src/main/java/org/sablecc/sablecc/node/AProductions.java
index f95ec5a099e09a9313a694432b1cc77957d6ccdf..4e73e965ea600e0f15e424066ea88f1eb4df0f90 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProductions.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProductions.java
@@ -14,13 +14,11 @@ public final class AProductions extends PProductions
 
     public AProductions()
     {
-        // Constructor
     }
 
     public AProductions(
           List<PProd> _prods_)
     {
-        // Constructor
         setProds(_prods_);
 
     }
@@ -78,7 +76,6 @@ public final class AProductions extends PProductions
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._prods_.remove(child))
         {
             return;
@@ -90,7 +87,6 @@ public final class AProductions extends PProductions
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         for(ListIterator<PProd> i = this._prods_.listIterator(); i.hasNext();)
         {
             if(i.next() == oldChild)
diff --git a/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java b/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
index 4eb1cc4b29b308c0134b3ecba3fbf68cbda994b0..c78c19fc5b0468841366b32a02353e0b760ae2d5 100644
--- a/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
@@ -10,13 +10,11 @@ public final class AQMarkUnOp extends PUnOp
 
     public AQMarkUnOp()
     {
-        // Constructor
     }
 
     public AQMarkUnOp(
           TQMark _qMark_)
     {
-        // Constructor
         setQMark(_qMark_);
 
     }
@@ -74,7 +72,6 @@ public final class AQMarkUnOp extends PUnOp
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._qMark_ == child)
         {
             this._qMark_ = null;
@@ -87,7 +84,6 @@ public final class AQMarkUnOp extends PUnOp
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._qMark_ == oldChild)
         {
             setQMark((TQMark) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/ARegExp.java b/src/main/java/org/sablecc/sablecc/node/ARegExp.java
index ad35d8b27432e4a8df7c469cbf57c813aa1c6878..7b604e5ddbe31e34039e8310248785e8029b45f7 100644
--- a/src/main/java/org/sablecc/sablecc/node/ARegExp.java
+++ b/src/main/java/org/sablecc/sablecc/node/ARegExp.java
@@ -14,13 +14,11 @@ public final class ARegExp extends PRegExp
 
     public ARegExp()
     {
-        // Constructor
     }
 
     public ARegExp(
           List<PConcat> _concats_)
     {
-        // Constructor
         setConcats(_concats_);
 
     }
@@ -78,7 +76,6 @@ public final class ARegExp extends PRegExp
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._concats_.remove(child))
         {
             return;
@@ -90,7 +87,6 @@ public final class ARegExp extends PRegExp
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         for(ListIterator<PConcat> i = this._concats_.listIterator(); i.hasNext();)
         {
             if(i.next() == oldChild)
diff --git a/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java b/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
index 8169e64fb913c1eddd618056d78d2c40d5e621c6..4978f8948f4f2ae400ede54cfcc72541ed16599f 100644
--- a/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
@@ -10,13 +10,11 @@ public final class ARegExpBasic extends PBasic
 
     public ARegExpBasic()
     {
-        // Constructor
     }
 
     public ARegExpBasic(
           PRegExp _regExp_)
     {
-        // Constructor
         setRegExp(_regExp_);
 
     }
@@ -74,7 +72,6 @@ public final class ARegExpBasic extends PBasic
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._regExp_ == child)
         {
             this._regExp_ = null;
@@ -87,7 +84,6 @@ public final class ARegExpBasic extends PBasic
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._regExp_ == oldChild)
         {
             setRegExp((PRegExp) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/ASetBasic.java b/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
index 10040dd0a0f43b69962f15b84ca873de2ba22bfb..53a957cb18e2da018bf57bafe8c31a794bd3d1fe 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
@@ -10,13 +10,11 @@ public final class ASetBasic extends PBasic
 
     public ASetBasic()
     {
-        // Constructor
     }
 
     public ASetBasic(
           PSet _set_)
     {
-        // Constructor
         setSet(_set_);
 
     }
@@ -74,7 +72,6 @@ public final class ASetBasic extends PBasic
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._set_ == child)
         {
             this._set_ = null;
@@ -87,7 +84,6 @@ public final class ASetBasic extends PBasic
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._set_ == oldChild)
         {
             setSet((PSet) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java b/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
index 2efef462828b5c08aeb359edd1b8b4555e2a1563..de072dddfccca3cf48bde6b7263bcc14b740dfc7 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
@@ -12,7 +12,6 @@ public final class ASimpleListTerm extends PListTerm
 
     public ASimpleListTerm()
     {
-        // Constructor
     }
 
     public ASimpleListTerm(
@@ -20,7 +19,6 @@ public final class ASimpleListTerm extends PListTerm
           TId _id_,
           TId _simpleTermTail_)
     {
-        // Constructor
         setSpecifier(_specifier_);
 
         setId(_id_);
@@ -136,7 +134,6 @@ public final class ASimpleListTerm extends PListTerm
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._specifier_ == child)
         {
             this._specifier_ = null;
@@ -161,7 +158,6 @@ public final class ASimpleListTerm extends PListTerm
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._specifier_ == oldChild)
         {
             setSpecifier((PSpecifier) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java b/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
index 1138d998a1cff02691ef3bd0ef93db955fa7a55e..801c48c2137f889c56e203d6c8dc86caa6734f45 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
@@ -12,7 +12,6 @@ public final class ASimpleTerm extends PTerm
 
     public ASimpleTerm()
     {
-        // Constructor
     }
 
     public ASimpleTerm(
@@ -20,7 +19,6 @@ public final class ASimpleTerm extends PTerm
           TId _id_,
           TId _simpleTermTail_)
     {
-        // Constructor
         setSpecifier(_specifier_);
 
         setId(_id_);
@@ -136,7 +134,6 @@ public final class ASimpleTerm extends PTerm
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._specifier_ == child)
         {
             this._specifier_ = null;
@@ -161,7 +158,6 @@ public final class ASimpleTerm extends PTerm
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._specifier_ == oldChild)
         {
             setSpecifier((PSpecifier) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java b/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
index 9e6fa0d45701ebb7a8df44bd79112912bf7401f0..626ff012036ea7c35177c470a56d78b0536f5a18 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
@@ -10,13 +10,11 @@ public final class AStarUnOp extends PUnOp
 
     public AStarUnOp()
     {
-        // Constructor
     }
 
     public AStarUnOp(
           TStar _star_)
     {
-        // Constructor
         setStar(_star_);
 
     }
@@ -74,7 +72,6 @@ public final class AStarUnOp extends PUnOp
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._star_ == child)
         {
             this._star_ = null;
@@ -87,7 +84,6 @@ public final class AStarUnOp extends PUnOp
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._star_ == oldChild)
         {
             setStar((TStar) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AStateList.java b/src/main/java/org/sablecc/sablecc/node/AStateList.java
index 7af91334ade49f4cd65670189bc7ae1e59bbc3e5..706d3c7ddeaed996c9c69bd7a0351661519fb6f4 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStateList.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStateList.java
@@ -16,7 +16,6 @@ public final class AStateList extends PStateList
 
     public AStateList()
     {
-        // Constructor
     }
 
     public AStateList(
@@ -24,7 +23,6 @@ public final class AStateList extends PStateList
           PTransition _transition_,
           List<PStateListTail> _stateLists_)
     {
-        // Constructor
         setId(_id_);
 
         setTransition(_transition_);
@@ -140,7 +138,6 @@ public final class AStateList extends PStateList
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._id_ == child)
         {
             this._id_ = null;
@@ -164,7 +161,6 @@ public final class AStateList extends PStateList
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._id_ == oldChild)
         {
             setId((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AStateListTail.java b/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
index 748b9dbc23cffba22b88fbe63e2fc9c1ccfc72e0..6f5222864c45d681ec832a2430f8519a444e86b8 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
@@ -11,14 +11,12 @@ public final class AStateListTail extends PStateListTail
 
     public AStateListTail()
     {
-        // Constructor
     }
 
     public AStateListTail(
           TId _id_,
           PTransition _transition_)
     {
-        // Constructor
         setId(_id_);
 
         setTransition(_transition_);
@@ -105,7 +103,6 @@ public final class AStateListTail extends PStateListTail
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._id_ == child)
         {
             this._id_ = null;
@@ -124,7 +121,6 @@ public final class AStateListTail extends PStateListTail
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._id_ == oldChild)
         {
             setId((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AStates.java b/src/main/java/org/sablecc/sablecc/node/AStates.java
index a191372642bbec5fbb06e9ff08165297dc33dddf..a5bd2e06f6ce99e7f00f662fc8e062c53cfab678 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStates.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStates.java
@@ -14,13 +14,11 @@ public final class AStates extends PStates
 
     public AStates()
     {
-        // Constructor
     }
 
     public AStates(
           List<TId> _listId_)
     {
-        // Constructor
         setListId(_listId_);
 
     }
@@ -78,7 +76,6 @@ public final class AStates extends PStates
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._listId_.remove(child))
         {
             return;
@@ -90,7 +87,6 @@ public final class AStates extends PStates
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         for(ListIterator<TId> i = this._listId_.listIterator(); i.hasNext();)
         {
             if(i.next() == oldChild)
diff --git a/src/main/java/org/sablecc/sablecc/node/AStringBasic.java b/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
index c52baeb47e15b7888ef5efd7a7a61330207613b1..ff1dd0a0d49bd4a47c9417cb9c8e706e8e9b8bb3 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
@@ -10,13 +10,11 @@ public final class AStringBasic extends PBasic
 
     public AStringBasic()
     {
-        // Constructor
     }
 
     public AStringBasic(
           TString _string_)
     {
-        // Constructor
         setString(_string_);
 
     }
@@ -74,7 +72,6 @@ public final class AStringBasic extends PBasic
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._string_ == child)
         {
             this._string_ = null;
@@ -87,7 +84,6 @@ public final class AStringBasic extends PBasic
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._string_ == oldChild)
         {
             setString((TString) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokenDef.java b/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
index 21aa248d38b76ca0e804744122f3fd86e39bee7f..b7af9703df8e7beb6eb767b1ffe14b14d41b0681 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
@@ -14,7 +14,6 @@ public final class ATokenDef extends PTokenDef
 
     public ATokenDef()
     {
-        // Constructor
     }
 
     public ATokenDef(
@@ -24,7 +23,6 @@ public final class ATokenDef extends PTokenDef
           TSlash _slash_,
           PRegExp _lookAhead_)
     {
-        // Constructor
         setStateList(_stateList_);
 
         setId(_id_);
@@ -198,7 +196,6 @@ public final class ATokenDef extends PTokenDef
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._stateList_ == child)
         {
             this._stateList_ = null;
@@ -235,7 +232,6 @@ public final class ATokenDef extends PTokenDef
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._stateList_ == oldChild)
         {
             setStateList((PStateList) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java b/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
index 4cabc05889acd10273cb4c0b519cf452a48b820d..b4223d8a7e03f741fb066afc2d5f9c209fb60c6d 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
@@ -9,7 +9,6 @@ public final class ATokenSpecifier extends PSpecifier
 
     public ATokenSpecifier()
     {
-        // Constructor
     }
 
     public ATokenSpecifier(ATokenSpecifier node)
@@ -38,14 +37,12 @@ public final class ATokenSpecifier extends PSpecifier
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         throw new RuntimeException("Not a child.");
     }
 
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         throw new RuntimeException("Not a child.");
     }
 }
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokens.java b/src/main/java/org/sablecc/sablecc/node/ATokens.java
index d128831b37934f484e107628fdbaa0dee4726267..d07b76d12cf03bb4245035872f64cf858325afc8 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokens.java
@@ -14,13 +14,11 @@ public final class ATokens extends PTokens
 
     public ATokens()
     {
-        // Constructor
     }
 
     public ATokens(
           List<PTokenDef> _tokenDefs_)
     {
-        // Constructor
         setTokenDefs(_tokenDefs_);
 
     }
@@ -78,7 +76,6 @@ public final class ATokens extends PTokens
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._tokenDefs_.remove(child))
         {
             return;
@@ -90,7 +87,6 @@ public final class ATokens extends PTokens
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         for(ListIterator<PTokenDef> i = this._tokenDefs_.listIterator(); i.hasNext();)
         {
             if(i.next() == oldChild)
diff --git a/src/main/java/org/sablecc/sablecc/node/ATransition.java b/src/main/java/org/sablecc/sablecc/node/ATransition.java
index efc2ecb8a722002ea320ef0a7b9e50dca51167cf..0e5499fb16083f7fb555f486833e752fc9bf4d8e 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATransition.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATransition.java
@@ -10,13 +10,11 @@ public final class ATransition extends PTransition
 
     public ATransition()
     {
-        // Constructor
     }
 
     public ATransition(
           TId _id_)
     {
-        // Constructor
         setId(_id_);
 
     }
@@ -74,7 +72,6 @@ public final class ATransition extends PTransition
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._id_ == child)
         {
             this._id_ = null;
@@ -87,7 +84,6 @@ public final class ATransition extends PTransition
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._id_ == oldChild)
         {
             setId((TId) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/AUnExp.java b/src/main/java/org/sablecc/sablecc/node/AUnExp.java
index 30185f0ab743acb499845cb39bb5e8873b78e709..6d7d40d738e775435094d94a6065bcae51b2aa65 100644
--- a/src/main/java/org/sablecc/sablecc/node/AUnExp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AUnExp.java
@@ -11,14 +11,12 @@ public final class AUnExp extends PUnExp
 
     public AUnExp()
     {
-        // Constructor
     }
 
     public AUnExp(
           PBasic _basic_,
           PUnOp _unOp_)
     {
-        // Constructor
         setBasic(_basic_);
 
         setUnOp(_unOp_);
@@ -105,7 +103,6 @@ public final class AUnExp extends PUnExp
     @Override
     void removeChild(Node child)
     {
-        // Remove child
         if(this._basic_ == child)
         {
             this._basic_ = null;
@@ -124,7 +121,6 @@ public final class AUnExp extends PUnExp
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
         if(this._basic_ == oldChild)
         {
             setBasic((PBasic) newChild);
diff --git a/src/main/java/org/sablecc/sablecc/node/Start.java b/src/main/java/org/sablecc/sablecc/node/Start.java
index f9e230a62e8a6a7916ef4290b0f8aae8341c03bd..751cb6f4ecd20d226a1d28f993d4b4846325ee64 100644
--- a/src/main/java/org/sablecc/sablecc/node/Start.java
+++ b/src/main/java/org/sablecc/sablecc/node/Start.java
@@ -10,9 +10,7 @@ public final class Start extends Node
     private EOF _eof_;
 
     public Start()
-    {
-        // Empty body
-    }
+    {}
 
     public Start(
         PGrammar _pGrammar_,
diff --git a/src/main/java/org/sablecc/sablecc/node/Switch.java b/src/main/java/org/sablecc/sablecc/node/Switch.java
index ca792e67ce93d850d977db6e8a7e3023818b68d6..121bb952052e2877a5bc7570f706ae4663fa2a46 100644
--- a/src/main/java/org/sablecc/sablecc/node/Switch.java
+++ b/src/main/java/org/sablecc/sablecc/node/Switch.java
@@ -3,6 +3,4 @@
 package org.sablecc.sablecc.node;
 
 public interface Switch
-{
-    // Empty body
-}
+{}
diff --git a/src/main/java/org/sablecc/sablecc/parser/Parser.java b/src/main/java/org/sablecc/sablecc/parser/Parser.java
index cddfe0fb50f58d7dbd6c654e0309e1acd8711ce9..9c626ba4bbb1263cc9f647aa35707479fd209000 100644
--- a/src/main/java/org/sablecc/sablecc/parser/Parser.java
+++ b/src/main/java/org/sablecc/sablecc/parser/Parser.java
@@ -1863,9 +1863,7 @@ public class Parser implements IParser
 
         PGrammar pgrammarNode1;
         {
-            // Block
         {
-            // Block
         }
 
         pgrammarNode1 = new AGrammar(Collections.EMPTY_LIST, null, null, null, null, null, null);
@@ -1883,10 +1881,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -1915,10 +1911,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
 
@@ -1939,11 +1933,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -1973,10 +1965,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
 
@@ -1997,11 +1987,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2032,11 +2020,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -2059,12 +2045,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2095,10 +2079,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PTokens ptokensNode5;
         {
-            // Block
         }
         ptokensNode5 = (PTokens)nodeArrayList1.get(0);
 
@@ -2119,11 +2101,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PTokens ptokensNode6;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2154,11 +2134,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PTokens ptokensNode5;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -2181,12 +2159,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PTokens ptokensNode6;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2218,11 +2194,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PTokens ptokensNode5;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -2245,12 +2219,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PTokens ptokensNode6;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2283,12 +2255,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PTokens ptokensNode5;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -2313,13 +2283,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         PTokens ptokensNode6;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2351,10 +2319,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PIgnTokens pigntokensNode6;
         {
-            // Block
         }
         pigntokensNode6 = (PIgnTokens)nodeArrayList1.get(0);
 
@@ -2375,11 +2341,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PIgnTokens pigntokensNode7;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2410,11 +2374,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PIgnTokens pigntokensNode6;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -2437,12 +2399,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PIgnTokens pigntokensNode7;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2474,11 +2434,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PIgnTokens pigntokensNode6;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -2501,12 +2459,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PIgnTokens pigntokensNode7;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2539,12 +2495,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PIgnTokens pigntokensNode6;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -2569,13 +2523,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         PIgnTokens pigntokensNode7;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2608,11 +2560,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         {
-            // Block
         }
         ptokensNode5 = (PTokens)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -2635,12 +2585,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2673,12 +2621,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -2703,13 +2649,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2743,12 +2687,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -2773,13 +2715,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2814,13 +2754,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -2847,14 +2785,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2887,10 +2823,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PProductions pproductionsNode7;
         {
-            // Block
         }
         pproductionsNode7 = (PProductions)nodeArrayList1.get(0);
 
@@ -2911,11 +2845,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -2946,11 +2878,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pproductionsNode7 = (PProductions)nodeArrayList2.get(0);
@@ -2973,12 +2903,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3010,11 +2938,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         pproductionsNode7 = (PProductions)nodeArrayList2.get(0);
@@ -3037,12 +2963,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3075,12 +2999,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -3105,13 +3027,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3144,11 +3064,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PTokens ptokensNode5;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         ptokensNode5 = (PTokens)nodeArrayList1.get(0);
         pproductionsNode7 = (PProductions)nodeArrayList2.get(0);
@@ -3171,12 +3089,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PTokens ptokensNode6;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3209,12 +3125,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PTokens ptokensNode5;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -3239,13 +3153,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PTokens ptokensNode6;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3279,12 +3191,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -3309,13 +3219,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PTokens ptokensNode6;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3350,13 +3258,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -3383,14 +3289,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         PTokens ptokensNode6;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3424,11 +3328,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         pigntokensNode6 = (PIgnTokens)nodeArrayList1.get(0);
         pproductionsNode7 = (PProductions)nodeArrayList2.get(0);
@@ -3451,12 +3353,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3489,12 +3389,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -3519,13 +3417,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3559,12 +3455,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -3589,13 +3483,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3630,13 +3522,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -3663,14 +3553,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3705,12 +3593,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         ptokensNode5 = (PTokens)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -3735,13 +3621,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3776,13 +3660,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -3809,14 +3691,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3852,13 +3732,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -3885,14 +3763,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -3929,14 +3805,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -3965,7 +3839,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
@@ -3973,7 +3846,6 @@ public class Parser implements IParser
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4007,10 +3879,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PAst pastNode8;
         {
-            // Block
         }
         pastNode8 = (PAst)nodeArrayList1.get(0);
 
@@ -4031,11 +3901,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4066,11 +3934,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pastNode8 = (PAst)nodeArrayList2.get(0);
@@ -4093,12 +3959,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4130,11 +3994,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PAst pastNode8;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         pastNode8 = (PAst)nodeArrayList2.get(0);
@@ -4157,12 +4019,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4195,12 +4055,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -4225,13 +4083,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4264,11 +4120,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PTokens ptokensNode5;
         PAst pastNode8;
         {
-            // Block
         }
         ptokensNode5 = (PTokens)nodeArrayList1.get(0);
         pastNode8 = (PAst)nodeArrayList2.get(0);
@@ -4291,12 +4145,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PTokens ptokensNode6;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4329,12 +4181,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PTokens ptokensNode5;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -4359,13 +4209,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PTokens ptokensNode6;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4399,12 +4247,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PAst pastNode8;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -4429,13 +4275,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PTokens ptokensNode6;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4470,13 +4314,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -4503,14 +4345,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         PTokens ptokensNode6;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4544,11 +4384,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PIgnTokens pigntokensNode6;
         PAst pastNode8;
         {
-            // Block
         }
         pigntokensNode6 = (PIgnTokens)nodeArrayList1.get(0);
         pastNode8 = (PAst)nodeArrayList2.get(0);
@@ -4571,12 +4409,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PIgnTokens pigntokensNode7;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4609,12 +4445,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PIgnTokens pigntokensNode6;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -4639,13 +4473,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PIgnTokens pigntokensNode7;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4679,12 +4511,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PIgnTokens pigntokensNode6;
         PAst pastNode8;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -4709,13 +4539,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PIgnTokens pigntokensNode7;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4750,13 +4578,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PIgnTokens pigntokensNode6;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -4783,14 +4609,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         PIgnTokens pigntokensNode7;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4825,12 +4649,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PAst pastNode8;
         {
-            // Block
         }
         ptokensNode5 = (PTokens)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -4855,13 +4677,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4896,13 +4716,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -4929,14 +4747,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -4972,13 +4788,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PAst pastNode8;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -5005,14 +4819,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5049,14 +4861,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -5085,7 +4895,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
@@ -5093,7 +4902,6 @@ public class Parser implements IParser
         PIgnTokens pigntokensNode7;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5128,11 +4936,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         pproductionsNode7 = (PProductions)nodeArrayList1.get(0);
         pastNode8 = (PAst)nodeArrayList2.get(0);
@@ -5155,12 +4961,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5193,12 +4997,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pproductionsNode7 = (PProductions)nodeArrayList2.get(0);
@@ -5223,13 +5025,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5263,12 +5063,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         pproductionsNode7 = (PProductions)nodeArrayList2.get(0);
@@ -5293,13 +5091,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5334,13 +5130,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -5367,14 +5161,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5409,12 +5201,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PTokens ptokensNode5;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         ptokensNode5 = (PTokens)nodeArrayList1.get(0);
         pproductionsNode7 = (PProductions)nodeArrayList2.get(0);
@@ -5439,13 +5229,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PTokens ptokensNode6;
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5480,13 +5268,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PTokens ptokensNode5;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -5513,14 +5299,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PTokens ptokensNode6;
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5556,13 +5340,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -5589,14 +5371,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PTokens ptokensNode6;
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5633,14 +5413,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -5669,7 +5447,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
@@ -5677,7 +5454,6 @@ public class Parser implements IParser
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5713,12 +5489,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         pigntokensNode6 = (PIgnTokens)nodeArrayList1.get(0);
         pproductionsNode7 = (PProductions)nodeArrayList2.get(0);
@@ -5743,13 +5517,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5784,13 +5556,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -5817,14 +5587,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5860,13 +5628,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -5893,14 +5659,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -5937,14 +5701,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -5973,7 +5735,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
@@ -5981,7 +5742,6 @@ public class Parser implements IParser
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -6018,13 +5778,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         ptokensNode5 = (PTokens)nodeArrayList1.get(0);
         pigntokensNode6 = (PIgnTokens)nodeArrayList2.get(0);
@@ -6051,14 +5809,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PTokens ptokensNode6;
         PIgnTokens pigntokensNode7;
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -6095,14 +5851,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -6131,7 +5885,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PTokens ptokensNode6;
@@ -6139,7 +5892,6 @@ public class Parser implements IParser
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -6177,14 +5929,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PStates pstatesNode4;
         PTokens ptokensNode5;
         PIgnTokens pigntokensNode6;
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         pstatesNode4 = (PStates)nodeArrayList1.get(0);
         ptokensNode5 = (PTokens)nodeArrayList2.get(0);
@@ -6213,7 +5963,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PStates pstatesNode5;
         PTokens ptokensNode6;
@@ -6221,7 +5970,6 @@ public class Parser implements IParser
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -6260,7 +6008,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         PHelpers phelpersNode3;
         PStates pstatesNode4;
         PTokens ptokensNode5;
@@ -6268,7 +6015,6 @@ public class Parser implements IParser
         PProductions pproductionsNode7;
         PAst pastNode8;
         {
-            // Block
         }
         phelpersNode3 = (PHelpers)nodeArrayList1.get(0);
         pstatesNode4 = (PStates)nodeArrayList2.get(0);
@@ -6299,7 +6045,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PGrammar pgrammarNode1;
         {
-            // Block
         List<TPkgId> listNode3 = new LinkedList<>();
         PHelpers phelpersNode4;
         PStates pstatesNode5;
@@ -6308,7 +6053,6 @@ public class Parser implements IParser
         PProductions pproductionsNode8;
         PAst pastNode9;
         {
-            // Block
         List<TPkgId> listNode2 = new LinkedList<>();
         listNode2 = (List<TPkgId>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -6344,7 +6088,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<TPkgId> listNode2 = new LinkedList<>();
         {
-            // Block
         List<TPkgId> listNode1 = new LinkedList<>();
         listNode1 = (List<TPkgId>)nodeArrayList2.get(0);
         if(listNode1 != null)
@@ -6371,7 +6114,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<TPkgId> listNode2 = new LinkedList<>();
         {
-            // Block
         TPkgId tpkgidNode1;
         tpkgidNode1 = (TPkgId)nodeArrayList1.get(0);
         if(tpkgidNode1 != null)
@@ -6395,7 +6137,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<TPkgId> listNode3 = new LinkedList<>();
         {
-            // Block
         TPkgId tpkgidNode1;
         List<TPkgId> listNode2 = new LinkedList<>();
         tpkgidNode1 = (TPkgId)nodeArrayList1.get(0);
@@ -6443,10 +6184,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PHelpers phelpersNode1;
         {
-            // Block
         List<PHelperDef> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PHelperDef> listNode2 = new LinkedList<>();
         listNode2 = (List<PHelperDef>)nodeArrayList2.get(0);
         if(listNode2 != null)
@@ -6478,7 +6217,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PHelperDef phelperdefNode1;
         {
-            // Block
         TId tidNode2;
         PRegExp pregexpNode3;
         tidNode2 = (TId)nodeArrayList1.get(0);
@@ -6502,10 +6240,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PStates pstatesNode1;
         {
-            // Block
         List<TId> listNode3 = new LinkedList<>();
         {
-            // Block
         List<TId> listNode2 = new LinkedList<>();
         listNode2 = (List<TId>)nodeArrayList2.get(0);
         if(listNode2 != null)
@@ -6534,7 +6270,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<TId> listNode2 = new LinkedList<>();
         {
-            // Block
         TId tidNode1;
         tidNode1 = (TId)nodeArrayList1.get(0);
         if(tidNode1 != null)
@@ -6557,7 +6292,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<TId> listNode3 = new LinkedList<>();
         {
-            // Block
         TId tidNode1;
         List<TId> listNode2 = new LinkedList<>();
         tidNode1 = (TId)nodeArrayList1.get(0);
@@ -6605,10 +6339,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTokens ptokensNode1;
         {
-            // Block
         List<PTokenDef> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PTokenDef> listNode2 = new LinkedList<>();
         listNode2 = (List<PTokenDef>)nodeArrayList2.get(0);
         if(listNode2 != null)
@@ -6640,7 +6372,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTokenDef ptokendefNode1;
         {
-            // Block
         TId tidNode3;
         PRegExp pregexpNode4;
         tidNode3 = (TId)nodeArrayList1.get(0);
@@ -6666,7 +6397,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTokenDef ptokendefNode1;
         {
-            // Block
         PStateList pstatelistNode2;
         TId tidNode3;
         PRegExp pregexpNode4;
@@ -6694,7 +6424,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTokenDef ptokendefNode1;
         {
-            // Block
         TId tidNode3;
         PRegExp pregexpNode4;
         TSlash tslashNode5;
@@ -6725,7 +6454,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTokenDef ptokendefNode1;
         {
-            // Block
         PStateList pstatelistNode2;
         TId tidNode3;
         PRegExp pregexpNode4;
@@ -6755,11 +6483,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PStateList pstatelistNode1;
         {
-            // Block
         TId tidNode2;
         tidNode2 = (TId)nodeArrayList2.get(0);
         {
-            // Block
         }
 
         pstatelistNode1 = new AStateList(tidNode2, null, Collections.EMPTY_LIST);
@@ -6781,13 +6507,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PStateList pstatelistNode1;
         {
-            // Block
         TId tidNode2;
         PTransition ptransitionNode3;
         tidNode2 = (TId)nodeArrayList2.get(0);
         ptransitionNode3 = (PTransition)nodeArrayList3.get(0);
         {
-            // Block
         }
 
         pstatelistNode1 = new AStateList(tidNode2, ptransitionNode3, Collections.EMPTY_LIST);
@@ -6809,12 +6533,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PStateList pstatelistNode1;
         {
-            // Block
         TId tidNode2;
         List<PStateListTail> listNode5 = new LinkedList<>();
         tidNode2 = (TId)nodeArrayList2.get(0);
         {
-            // Block
         List<PStateListTail> listNode4 = new LinkedList<>();
         listNode4 = (List<PStateListTail>)nodeArrayList3.get(0);
         if(listNode4 != null)
@@ -6847,14 +6569,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PStateList pstatelistNode1;
         {
-            // Block
         TId tidNode2;
         PTransition ptransitionNode3;
         List<PStateListTail> listNode5 = new LinkedList<>();
         tidNode2 = (TId)nodeArrayList2.get(0);
         ptransitionNode3 = (PTransition)nodeArrayList3.get(0);
         {
-            // Block
         List<PStateListTail> listNode4 = new LinkedList<>();
         listNode4 = (List<PStateListTail>)nodeArrayList4.get(0);
         if(listNode4 != null)
@@ -6884,7 +6604,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PStateListTail pstatelisttailNode1;
         {
-            // Block
         TId tidNode2;
         tidNode2 = (TId)nodeArrayList2.get(0);
 
@@ -6906,7 +6625,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PStateListTail pstatelisttailNode1;
         {
-            // Block
         TId tidNode2;
         PTransition ptransitionNode3;
         tidNode2 = (TId)nodeArrayList2.get(0);
@@ -6929,7 +6647,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTransition ptransitionNode1;
         {
-            // Block
         TId tidNode2;
         tidNode2 = (TId)nodeArrayList2.get(0);
 
@@ -6951,9 +6668,7 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PIgnTokens pigntokensNode1;
         {
-            // Block
         {
-            // Block
         }
 
         pigntokensNode1 = new AIgnTokens(Collections.EMPTY_LIST);
@@ -6975,10 +6690,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PIgnTokens pigntokensNode1;
         {
-            // Block
         List<TId> listNode3 = new LinkedList<>();
         {
-            // Block
         List<TId> listNode2 = new LinkedList<>();
         listNode2 = (List<TId>)nodeArrayList3.get(0);
         if(listNode2 != null)
@@ -7025,10 +6738,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PRegExp pregexpNode1;
         {
-            // Block
         List<PConcat> listNode3 = new LinkedList<>();
         {
-            // Block
         PConcat pconcatNode2;
         pconcatNode2 = (PConcat)nodeArrayList1.get(0);
         if(pconcatNode2 != null)
@@ -7054,10 +6765,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PRegExp pregexpNode1;
         {
-            // Block
         List<PConcat> listNode4 = new LinkedList<>();
         {
-            // Block
         PConcat pconcatNode2;
         List<PConcat> listNode3 = new LinkedList<>();
         pconcatNode2 = (PConcat)nodeArrayList1.get(0);
@@ -7106,9 +6815,7 @@ public class Parser implements IParser
 
         PConcat pconcatNode1;
         {
-            // Block
         {
-            // Block
         }
 
         pconcatNode1 = new AConcat(Collections.EMPTY_LIST);
@@ -7126,10 +6833,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PConcat pconcatNode1;
         {
-            // Block
         List<PUnExp> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PUnExp> listNode2 = new LinkedList<>();
         listNode2 = (List<PUnExp>)nodeArrayList1.get(0);
         if(listNode2 != null)
@@ -7158,7 +6863,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PUnExp punexpNode1;
         {
-            // Block
         PBasic pbasicNode2;
         pbasicNode2 = (PBasic)nodeArrayList1.get(0);
 
@@ -7179,7 +6883,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PUnExp punexpNode1;
         {
-            // Block
         PBasic pbasicNode2;
         PUnOp punopNode3;
         pbasicNode2 = (PBasic)nodeArrayList1.get(0);
@@ -7201,7 +6904,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PBasic pbasicNode1;
         {
-            // Block
         PChar pcharNode2;
         pcharNode2 = (PChar)nodeArrayList1.get(0);
 
@@ -7221,7 +6923,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PBasic pbasicNode1;
         {
-            // Block
         PSet psetNode2;
         psetNode2 = (PSet)nodeArrayList1.get(0);
 
@@ -7241,7 +6942,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PBasic pbasicNode1;
         {
-            // Block
         TString tstringNode2;
         tstringNode2 = (TString)nodeArrayList1.get(0);
 
@@ -7261,7 +6961,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PBasic pbasicNode1;
         {
-            // Block
         TId tidNode2;
         tidNode2 = (TId)nodeArrayList1.get(0);
 
@@ -7283,7 +6982,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PBasic pbasicNode1;
         {
-            // Block
         PRegExp pregexpNode2;
         pregexpNode2 = (PRegExp)nodeArrayList2.get(0);
 
@@ -7303,7 +7001,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PChar pcharNode1;
         {
-            // Block
         TChar tcharNode2;
         tcharNode2 = (TChar)nodeArrayList1.get(0);
 
@@ -7323,7 +7020,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PChar pcharNode1;
         {
-            // Block
         TDecChar tdeccharNode2;
         tdeccharNode2 = (TDecChar)nodeArrayList1.get(0);
 
@@ -7343,7 +7039,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PChar pcharNode1;
         {
-            // Block
         THexChar thexcharNode2;
         thexcharNode2 = (THexChar)nodeArrayList1.get(0);
 
@@ -7367,7 +7062,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PSet psetNode1;
         {
-            // Block
         PBasic pbasicNode2;
         PBinOp pbinopNode3;
         PBasic pbasicNode4;
@@ -7395,7 +7089,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PSet psetNode1;
         {
-            // Block
         PChar pcharNode2;
         PChar pcharNode3;
         pcharNode2 = (PChar)nodeArrayList2.get(0);
@@ -7417,7 +7110,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PUnOp punopNode1;
         {
-            // Block
         TStar tstarNode2;
         tstarNode2 = (TStar)nodeArrayList1.get(0);
 
@@ -7437,7 +7129,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PUnOp punopNode1;
         {
-            // Block
         TQMark tqmarkNode2;
         tqmarkNode2 = (TQMark)nodeArrayList1.get(0);
 
@@ -7457,7 +7148,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PUnOp punopNode1;
         {
-            // Block
         TPlus tplusNode2;
         tplusNode2 = (TPlus)nodeArrayList1.get(0);
 
@@ -7477,7 +7167,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PBinOp pbinopNode1;
         {
-            // Block
 
         pbinopNode1 = new APlusBinOp();
         }
@@ -7495,7 +7184,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PBinOp pbinopNode1;
         {
-            // Block
 
         pbinopNode1 = new AMinusBinOp();
         }
@@ -7514,10 +7202,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PProductions pproductionsNode1;
         {
-            // Block
         List<PProd> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PProd> listNode2 = new LinkedList<>();
         listNode2 = (List<PProd>)nodeArrayList2.get(0);
         if(listNode2 != null)
@@ -7549,15 +7235,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PProd pprodNode1;
         {
-            // Block
         TId tidNode2;
         List<PAlt> listNode6 = new LinkedList<>();
         tidNode2 = (TId)nodeArrayList1.get(0);
         {
-            // Block
         }
         {
-            // Block
         List<PAlt> listNode5 = new LinkedList<>();
         listNode5 = (List<PAlt>)nodeArrayList3.get(0);
         if(listNode5 != null)
@@ -7590,7 +7273,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PProd pprodNode1;
         {
-            // Block
         TId tidNode2;
         TArrow tarrowNode3;
         List<PElem> listNode5 = new LinkedList<>();
@@ -7598,7 +7280,6 @@ public class Parser implements IParser
         tidNode2 = (TId)nodeArrayList1.get(0);
         tarrowNode3 = (TArrow)nodeArrayList2.get(0);
         {
-            // Block
         List<PElem> listNode4 = new LinkedList<>();
         listNode4 = (List<PElem>)nodeArrayList2.get(1);
         if(listNode4 != null)
@@ -7611,7 +7292,6 @@ public class Parser implements IParser
         }
         }
         {
-            // Block
         List<PAlt> listNode6 = new LinkedList<>();
         listNode6 = (List<PAlt>)nodeArrayList4.get(0);
         if(listNode6 != null)
@@ -7643,7 +7323,6 @@ public class Parser implements IParser
         TArrow tarrowNode1;
         tarrowNode1 = (TArrow)nodeArrayList2.get(0);
         {
-            // Block
         }
         nodeList.add(tarrowNode1);
         nodeList.add(Collections.EMPTY_LIST);
@@ -7665,7 +7344,6 @@ public class Parser implements IParser
         List<PElem> listNode3 = new LinkedList<>();
         tarrowNode1 = (TArrow)nodeArrayList2.get(0);
         {
-            // Block
         List<PElem> listNode2 = new LinkedList<>();
         listNode2 = (List<PElem>)nodeArrayList3.get(0);
         if(listNode2 != null)
@@ -7692,7 +7370,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PAlt> listNode2 = new LinkedList<>();
         {
-            // Block
         PAlt paltNode1;
         paltNode1 = (PAlt)nodeArrayList1.get(0);
         if(paltNode1 != null)
@@ -7715,7 +7392,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PAlt> listNode3 = new LinkedList<>();
         {
-            // Block
         PAlt paltNode1;
         List<PAlt> listNode2 = new LinkedList<>();
         paltNode1 = (PAlt)nodeArrayList1.get(0);
@@ -7761,9 +7437,7 @@ public class Parser implements IParser
 
         PAlt paltNode1;
         {
-            // Block
         {
-            // Block
         }
 
         paltNode1 = new AAlt(null, Collections.EMPTY_LIST, null);
@@ -7781,11 +7455,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAlt paltNode1;
         {
-            // Block
         TId tidNode2;
         tidNode2 = (TId)nodeArrayList1.get(0);
         {
-            // Block
         }
 
         paltNode1 = new AAlt(tidNode2, Collections.EMPTY_LIST, null);
@@ -7804,10 +7476,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAlt paltNode1;
         {
-            // Block
         List<PElem> listNode4 = new LinkedList<>();
         {
-            // Block
         List<PElem> listNode3 = new LinkedList<>();
         listNode3 = (List<PElem>)nodeArrayList1.get(0);
         if(listNode3 != null)
@@ -7837,12 +7507,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAlt paltNode1;
         {
-            // Block
         TId tidNode2;
         List<PElem> listNode4 = new LinkedList<>();
         tidNode2 = (TId)nodeArrayList1.get(0);
         {
-            // Block
         List<PElem> listNode3 = new LinkedList<>();
         listNode3 = (List<PElem>)nodeArrayList2.get(0);
         if(listNode3 != null)
@@ -7871,10 +7539,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAlt paltNode1;
         {
-            // Block
         PAltTransform palttransformNode4;
         {
-            // Block
         }
         palttransformNode4 = (PAltTransform)nodeArrayList1.get(0);
 
@@ -7895,12 +7561,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAlt paltNode1;
         {
-            // Block
         TId tidNode2;
         PAltTransform palttransformNode4;
         tidNode2 = (TId)nodeArrayList1.get(0);
         {
-            // Block
         }
         palttransformNode4 = (PAltTransform)nodeArrayList2.get(0);
 
@@ -7921,11 +7585,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAlt paltNode1;
         {
-            // Block
         List<PElem> listNode4 = new LinkedList<>();
         PAltTransform palttransformNode5;
         {
-            // Block
         List<PElem> listNode3 = new LinkedList<>();
         listNode3 = (List<PElem>)nodeArrayList1.get(0);
         if(listNode3 != null)
@@ -7957,13 +7619,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAlt paltNode1;
         {
-            // Block
         TId tidNode2;
         List<PElem> listNode4 = new LinkedList<>();
         PAltTransform palttransformNode5;
         tidNode2 = (TId)nodeArrayList1.get(0);
         {
-            // Block
         List<PElem> listNode3 = new LinkedList<>();
         listNode3 = (List<PElem>)nodeArrayList2.get(0);
         if(listNode3 != null)
@@ -7995,12 +7655,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAltTransform palttransformNode1;
         {
-            // Block
         TLBrace tlbraceNode2;
         TRBrace trbraceNode4;
         tlbraceNode2 = (TLBrace)nodeArrayList1.get(0);
         {
-            // Block
         }
         trbraceNode4 = (TRBrace)nodeArrayList3.get(0);
 
@@ -8023,13 +7681,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAltTransform palttransformNode1;
         {
-            // Block
         TLBrace tlbraceNode2;
         List<PTerm> listNode4 = new LinkedList<>();
         TRBrace trbraceNode5;
         tlbraceNode2 = (TLBrace)nodeArrayList1.get(0);
         {
-            // Block
         List<PTerm> listNode3 = new LinkedList<>();
         listNode3 = (List<PTerm>)nodeArrayList3.get(0);
         if(listNode3 != null)
@@ -8062,13 +7718,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTerm ptermNode1;
         {
-            // Block
         PProdName pprodnameNode2;
         TLPar tlparNode3;
         pprodnameNode2 = (PProdName)nodeArrayList2.get(0);
         tlparNode3 = (TLPar)nodeArrayList3.get(0);
         {
-            // Block
         }
 
         ptermNode1 = new ANewTerm(pprodnameNode2, tlparNode3, Collections.EMPTY_LIST);
@@ -8091,14 +7745,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTerm ptermNode1;
         {
-            // Block
         PProdName pprodnameNode2;
         TLPar tlparNode3;
         List<PTerm> listNode5 = new LinkedList<>();
         pprodnameNode2 = (PProdName)nodeArrayList2.get(0);
         tlparNode3 = (TLPar)nodeArrayList3.get(0);
         {
-            // Block
         List<PTerm> listNode4 = new LinkedList<>();
         listNode4 = (List<PTerm>)nodeArrayList4.get(0);
         if(listNode4 != null)
@@ -8128,11 +7780,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTerm ptermNode1;
         {
-            // Block
         TLBkt tlbktNode2;
         tlbktNode2 = (TLBkt)nodeArrayList1.get(0);
         {
-            // Block
         }
 
         ptermNode1 = new AListTerm(tlbktNode2, Collections.EMPTY_LIST);
@@ -8153,12 +7803,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTerm ptermNode1;
         {
-            // Block
         TLBkt tlbktNode2;
         List<PListTerm> listNode4 = new LinkedList<>();
         tlbktNode2 = (TLBkt)nodeArrayList1.get(0);
         {
-            // Block
         List<PListTerm> listNode3 = new LinkedList<>();
         listNode3 = (List<PListTerm>)nodeArrayList2.get(0);
         if(listNode3 != null)
@@ -8187,7 +7835,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTerm ptermNode1;
         {
-            // Block
         TId tidNode3;
         tidNode3 = (TId)nodeArrayList1.get(0);
 
@@ -8208,7 +7855,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTerm ptermNode1;
         {
-            // Block
         PSpecifier pspecifierNode2;
         TId tidNode3;
         pspecifierNode2 = (PSpecifier)nodeArrayList1.get(0);
@@ -8231,7 +7877,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTerm ptermNode1;
         {
-            // Block
         TId tidNode3;
         TId tidNode4;
         tidNode3 = (TId)nodeArrayList1.get(0);
@@ -8255,7 +7900,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTerm ptermNode1;
         {
-            // Block
         PSpecifier pspecifierNode2;
         TId tidNode3;
         TId tidNode4;
@@ -8279,7 +7923,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PTerm ptermNode1;
         {
-            // Block
 
         ptermNode1 = new ANullTerm();
         }
@@ -8297,7 +7940,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PListTerm> listNode2 = new LinkedList<>();
         {
-            // Block
         PListTerm plisttermNode1;
         plisttermNode1 = (PListTerm)nodeArrayList1.get(0);
         if(plisttermNode1 != null)
@@ -8320,7 +7962,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PListTerm> listNode3 = new LinkedList<>();
         {
-            // Block
         PListTerm plisttermNode1;
         List<PListTerm> listNode2 = new LinkedList<>();
         plisttermNode1 = (PListTerm)nodeArrayList1.get(0);
@@ -8355,13 +7996,11 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PListTerm plisttermNode1;
         {
-            // Block
         PProdName pprodnameNode2;
         TLPar tlparNode3;
         pprodnameNode2 = (PProdName)nodeArrayList2.get(0);
         tlparNode3 = (TLPar)nodeArrayList3.get(0);
         {
-            // Block
         }
 
         plisttermNode1 = new ANewListTerm(pprodnameNode2, tlparNode3, Collections.EMPTY_LIST);
@@ -8384,14 +8023,12 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PListTerm plisttermNode1;
         {
-            // Block
         PProdName pprodnameNode2;
         TLPar tlparNode3;
         List<PTerm> listNode5 = new LinkedList<>();
         pprodnameNode2 = (PProdName)nodeArrayList2.get(0);
         tlparNode3 = (TLPar)nodeArrayList3.get(0);
         {
-            // Block
         List<PTerm> listNode4 = new LinkedList<>();
         listNode4 = (List<PTerm>)nodeArrayList4.get(0);
         if(listNode4 != null)
@@ -8420,7 +8057,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PListTerm plisttermNode1;
         {
-            // Block
         TId tidNode3;
         tidNode3 = (TId)nodeArrayList1.get(0);
 
@@ -8441,7 +8077,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PListTerm plisttermNode1;
         {
-            // Block
         PSpecifier pspecifierNode2;
         TId tidNode3;
         pspecifierNode2 = (PSpecifier)nodeArrayList1.get(0);
@@ -8464,7 +8099,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PListTerm plisttermNode1;
         {
-            // Block
         TId tidNode3;
         TId tidNode4;
         tidNode3 = (TId)nodeArrayList1.get(0);
@@ -8488,7 +8122,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PListTerm plisttermNode1;
         {
-            // Block
         PSpecifier pspecifierNode2;
         TId tidNode3;
         TId tidNode4;
@@ -8542,7 +8175,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PProdName pprodnameNode1;
         {
-            // Block
         TId tidNode2;
         tidNode2 = (TId)nodeArrayList1.get(0);
 
@@ -8563,7 +8195,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PProdName pprodnameNode1;
         {
-            // Block
         TId tidNode2;
         TId tidNode3;
         tidNode2 = (TId)nodeArrayList1.get(0);
@@ -8600,7 +8231,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PTerm> listNode2 = new LinkedList<>();
         {
-            // Block
         PTerm ptermNode1;
         ptermNode1 = (PTerm)nodeArrayList1.get(0);
         if(ptermNode1 != null)
@@ -8623,7 +8253,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PTerm> listNode3 = new LinkedList<>();
         {
-            // Block
         PTerm ptermNode1;
         List<PTerm> listNode2 = new LinkedList<>();
         ptermNode1 = (PTerm)nodeArrayList1.get(0);
@@ -8686,7 +8315,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PElem pelemNode1;
         {
-            // Block
         TId tidNode4;
         tidNode4 = (TId)nodeArrayList1.get(0);
 
@@ -8707,7 +8335,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PElem pelemNode1;
         {
-            // Block
         TId tidNode2;
         TId tidNode4;
         tidNode2 = (TId)nodeArrayList1.get(0);
@@ -8730,7 +8357,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PElem pelemNode1;
         {
-            // Block
         PSpecifier pspecifierNode3;
         TId tidNode4;
         pspecifierNode3 = (PSpecifier)nodeArrayList1.get(0);
@@ -8754,7 +8380,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PElem pelemNode1;
         {
-            // Block
         TId tidNode2;
         PSpecifier pspecifierNode3;
         TId tidNode4;
@@ -8779,7 +8404,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PElem pelemNode1;
         {
-            // Block
         TId tidNode4;
         PUnOp punopNode5;
         tidNode4 = (TId)nodeArrayList1.get(0);
@@ -8803,7 +8427,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PElem pelemNode1;
         {
-            // Block
         TId tidNode2;
         TId tidNode4;
         PUnOp punopNode5;
@@ -8829,7 +8452,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PElem pelemNode1;
         {
-            // Block
         PSpecifier pspecifierNode3;
         TId tidNode4;
         PUnOp punopNode5;
@@ -8856,7 +8478,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PElem pelemNode1;
         {
-            // Block
         TId tidNode2;
         PSpecifier pspecifierNode3;
         TId tidNode4;
@@ -8900,7 +8521,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PSpecifier pspecifierNode1;
         {
-            // Block
 
         pspecifierNode1 = new ATokenSpecifier();
         }
@@ -8919,7 +8539,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PSpecifier pspecifierNode1;
         {
-            // Block
 
         pspecifierNode1 = new AProductionSpecifier();
         }
@@ -8940,10 +8559,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAst pastNode1;
         {
-            // Block
         List<PAstProd> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PAstProd> listNode2 = new LinkedList<>();
         listNode2 = (List<PAstProd>)nodeArrayList4.get(0);
         if(listNode2 != null)
@@ -8975,12 +8592,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAstProd pastprodNode1;
         {
-            // Block
         TId tidNode2;
         List<PAstAlt> listNode4 = new LinkedList<>();
         tidNode2 = (TId)nodeArrayList1.get(0);
         {
-            // Block
         List<PAstAlt> listNode3 = new LinkedList<>();
         listNode3 = (List<PAstAlt>)nodeArrayList3.get(0);
         if(listNode3 != null)
@@ -9009,7 +8624,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PAstAlt> listNode2 = new LinkedList<>();
         {
-            // Block
         PAstAlt pastaltNode1;
         pastaltNode1 = (PAstAlt)nodeArrayList1.get(0);
         if(pastaltNode1 != null)
@@ -9032,7 +8646,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PAstAlt> listNode3 = new LinkedList<>();
         {
-            // Block
         PAstAlt pastaltNode1;
         List<PAstAlt> listNode2 = new LinkedList<>();
         pastaltNode1 = (PAstAlt)nodeArrayList1.get(0);
@@ -9078,9 +8691,7 @@ public class Parser implements IParser
 
         PAstAlt pastaltNode1;
         {
-            // Block
         {
-            // Block
         }
 
         pastaltNode1 = new AAstAlt(null, Collections.EMPTY_LIST);
@@ -9098,11 +8709,9 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAstAlt pastaltNode1;
         {
-            // Block
         TId tidNode2;
         tidNode2 = (TId)nodeArrayList1.get(0);
         {
-            // Block
         }
 
         pastaltNode1 = new AAstAlt(tidNode2, Collections.EMPTY_LIST);
@@ -9121,10 +8730,8 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAstAlt pastaltNode1;
         {
-            // Block
         List<PElem> listNode4 = new LinkedList<>();
         {
-            // Block
         List<PElem> listNode3 = new LinkedList<>();
         listNode3 = (List<PElem>)nodeArrayList1.get(0);
         if(listNode3 != null)
@@ -9154,12 +8761,10 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         PAstAlt pastaltNode1;
         {
-            // Block
         TId tidNode2;
         List<PElem> listNode4 = new LinkedList<>();
         tidNode2 = (TId)nodeArrayList1.get(0);
         {
-            // Block
         List<PElem> listNode3 = new LinkedList<>();
         listNode3 = (List<PElem>)nodeArrayList2.get(0);
         if(listNode3 != null)
@@ -9188,7 +8793,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<TPkgId> listNode2 = new LinkedList<>();
         {
-            // Block
         TPkgId tpkgidNode1;
         tpkgidNode1 = (TPkgId)nodeArrayList1.get(0);
         if(tpkgidNode1 != null)
@@ -9211,7 +8815,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<TPkgId> listNode3 = new LinkedList<>();
         {
-            // Block
         List<TPkgId> listNode1 = new LinkedList<>();
         TPkgId tpkgidNode2;
         listNode1 = (List<TPkgId>)nodeArrayList1.get(0);
@@ -9243,7 +8846,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PHelperDef> listNode2 = new LinkedList<>();
         {
-            // Block
         PHelperDef phelperdefNode1;
         phelperdefNode1 = (PHelperDef)nodeArrayList1.get(0);
         if(phelperdefNode1 != null)
@@ -9266,7 +8868,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PHelperDef> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PHelperDef> listNode1 = new LinkedList<>();
         PHelperDef phelperdefNode2;
         listNode1 = (List<PHelperDef>)nodeArrayList1.get(0);
@@ -9298,7 +8899,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<TId> listNode2 = new LinkedList<>();
         {
-            // Block
         TId tidNode1;
         tidNode1 = (TId)nodeArrayList1.get(0);
         if(tidNode1 != null)
@@ -9321,7 +8921,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<TId> listNode3 = new LinkedList<>();
         {
-            // Block
         List<TId> listNode1 = new LinkedList<>();
         TId tidNode2;
         listNode1 = (List<TId>)nodeArrayList1.get(0);
@@ -9353,7 +8952,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PTokenDef> listNode2 = new LinkedList<>();
         {
-            // Block
         PTokenDef ptokendefNode1;
         ptokendefNode1 = (PTokenDef)nodeArrayList1.get(0);
         if(ptokendefNode1 != null)
@@ -9376,7 +8974,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PTokenDef> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PTokenDef> listNode1 = new LinkedList<>();
         PTokenDef ptokendefNode2;
         listNode1 = (List<PTokenDef>)nodeArrayList1.get(0);
@@ -9408,7 +9005,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PStateListTail> listNode2 = new LinkedList<>();
         {
-            // Block
         PStateListTail pstatelisttailNode1;
         pstatelisttailNode1 = (PStateListTail)nodeArrayList1.get(0);
         if(pstatelisttailNode1 != null)
@@ -9431,7 +9027,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PStateListTail> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PStateListTail> listNode1 = new LinkedList<>();
         PStateListTail pstatelisttailNode2;
         listNode1 = (List<PStateListTail>)nodeArrayList1.get(0);
@@ -9463,7 +9058,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PConcat> listNode2 = new LinkedList<>();
         {
-            // Block
         PConcat pconcatNode1;
         pconcatNode1 = (PConcat)nodeArrayList1.get(0);
         if(pconcatNode1 != null)
@@ -9486,7 +9080,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PConcat> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PConcat> listNode1 = new LinkedList<>();
         PConcat pconcatNode2;
         listNode1 = (List<PConcat>)nodeArrayList1.get(0);
@@ -9518,7 +9111,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PUnExp> listNode2 = new LinkedList<>();
         {
-            // Block
         PUnExp punexpNode1;
         punexpNode1 = (PUnExp)nodeArrayList1.get(0);
         if(punexpNode1 != null)
@@ -9541,7 +9133,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PUnExp> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PUnExp> listNode1 = new LinkedList<>();
         PUnExp punexpNode2;
         listNode1 = (List<PUnExp>)nodeArrayList1.get(0);
@@ -9573,7 +9164,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PProd> listNode2 = new LinkedList<>();
         {
-            // Block
         PProd pprodNode1;
         pprodNode1 = (PProd)nodeArrayList1.get(0);
         if(pprodNode1 != null)
@@ -9596,7 +9186,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PProd> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PProd> listNode1 = new LinkedList<>();
         PProd pprodNode2;
         listNode1 = (List<PProd>)nodeArrayList1.get(0);
@@ -9628,7 +9217,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PElem> listNode2 = new LinkedList<>();
         {
-            // Block
         PElem pelemNode1;
         pelemNode1 = (PElem)nodeArrayList1.get(0);
         if(pelemNode1 != null)
@@ -9651,7 +9239,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PElem> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PElem> listNode1 = new LinkedList<>();
         PElem pelemNode2;
         listNode1 = (List<PElem>)nodeArrayList1.get(0);
@@ -9683,7 +9270,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PAlt> listNode2 = new LinkedList<>();
         {
-            // Block
         PAlt paltNode1;
         paltNode1 = (PAlt)nodeArrayList1.get(0);
         if(paltNode1 != null)
@@ -9706,7 +9292,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PAlt> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PAlt> listNode1 = new LinkedList<>();
         PAlt paltNode2;
         listNode1 = (List<PAlt>)nodeArrayList1.get(0);
@@ -9738,7 +9323,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PTerm> listNode2 = new LinkedList<>();
         {
-            // Block
         PTerm ptermNode1;
         ptermNode1 = (PTerm)nodeArrayList1.get(0);
         if(ptermNode1 != null)
@@ -9761,7 +9345,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PTerm> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PTerm> listNode1 = new LinkedList<>();
         PTerm ptermNode2;
         listNode1 = (List<PTerm>)nodeArrayList1.get(0);
@@ -9793,7 +9376,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PListTerm> listNode2 = new LinkedList<>();
         {
-            // Block
         PListTerm plisttermNode1;
         plisttermNode1 = (PListTerm)nodeArrayList1.get(0);
         if(plisttermNode1 != null)
@@ -9816,7 +9398,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PListTerm> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PListTerm> listNode1 = new LinkedList<>();
         PListTerm plisttermNode2;
         listNode1 = (List<PListTerm>)nodeArrayList1.get(0);
@@ -9848,7 +9429,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PTerm> listNode2 = new LinkedList<>();
         {
-            // Block
         PTerm ptermNode1;
         ptermNode1 = (PTerm)nodeArrayList1.get(0);
         if(ptermNode1 != null)
@@ -9871,7 +9451,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PTerm> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PTerm> listNode1 = new LinkedList<>();
         PTerm ptermNode2;
         listNode1 = (List<PTerm>)nodeArrayList1.get(0);
@@ -9903,7 +9482,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PAstProd> listNode2 = new LinkedList<>();
         {
-            // Block
         PAstProd pastprodNode1;
         pastprodNode1 = (PAstProd)nodeArrayList1.get(0);
         if(pastprodNode1 != null)
@@ -9926,7 +9504,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PAstProd> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PAstProd> listNode1 = new LinkedList<>();
         PAstProd pastprodNode2;
         listNode1 = (List<PAstProd>)nodeArrayList1.get(0);
@@ -9958,7 +9535,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PAstAlt> listNode2 = new LinkedList<>();
         {
-            // Block
         PAstAlt pastaltNode1;
         pastaltNode1 = (PAstAlt)nodeArrayList1.get(0);
         if(pastaltNode1 != null)
@@ -9981,7 +9557,6 @@ public class Parser implements IParser
         List<Object> nodeArrayList1 = pop();
         List<PAstAlt> listNode3 = new LinkedList<>();
         {
-            // Block
         List<PAstAlt> listNode1 = new LinkedList<>();
         PAstAlt pastaltNode2;
         listNode1 = (List<PAstAlt>)nodeArrayList1.get(0);
diff --git a/src/main/resources/org/sablecc/sablecc/alternatives.txt b/src/main/resources/org/sablecc/sablecc/alternatives.txt
index e5cd53d8497334fc0007e806b445a7ea5cf89158..3dd2fc3dd641175b3d656a986e8061e7c53bc785 100644
--- a/src/main/resources/org/sablecc/sablecc/alternatives.txt
+++ b/src/main/resources/org/sablecc/sablecc/alternatives.txt
@@ -57,7 +57,6 @@ $
 Macro:ConstructorBodyHeader
 )
     {
-        // Constructor
 
 $
 
@@ -204,7 +203,6 @@ Macro:RemoveChildHeader
     @Override
     void removeChild(Node child)
     {
-        // Remove child
 
 $
 
@@ -238,7 +236,6 @@ Macro:ReplaceChildHeader
     @Override
     void replaceChild(Node oldChild, Node newChild)
     {
-        // Replace child
 
 $
 
diff --git a/src/main/resources/org/sablecc/sablecc/analyses.txt b/src/main/resources/org/sablecc/sablecc/analyses.txt
index 47b3d044d6006f8edbd4f73cb9ffc89daa4d06b8..0a2f1c36f1ffa5cef6ddfd81a58073b7d1451049 100644
--- a/src/main/resources/org/sablecc/sablecc/analyses.txt
+++ b/src/main/resources/org/sablecc/sablecc/analyses.txt
@@ -72,9 +72,7 @@ Macro:AnalysisAdapterTail
     }
 
     public void defaultCase(Node node)
-    {
-        // do nothing
-    }
+    {}
 }
 
 $
@@ -102,14 +100,10 @@ public class DepthFirstAdapter extends AnalysisAdapter
     }
 
     public void defaultIn(Node node)
-    {
-        // Do nothing
-    }
+    {}
 
     public void defaultOut(Node node)
-    {
-        // Do nothing
-    }
+    {}
 
     @Override
     public void caseStart(Start node)
@@ -146,14 +140,10 @@ public class ReversedDepthFirstAdapter extends AnalysisAdapter
     }
 
     public void defaultIn(Node node)
-    {
-        // Do nothing
-    }
+    {}
 
     public void defaultOut(Node node)
-    {
-        // Do nothing
-    }
+    {}
 
     @Override
     public void caseStart(Start node)
diff --git a/src/main/resources/org/sablecc/sablecc/lexer.txt b/src/main/resources/org/sablecc/sablecc/lexer.txt
index efa65983db58191cd7d0e628fb2ce51ebeced1b4..d1d3fdec95d45944f72b3b99d14d438bf607eeed 100644
--- a/src/main/resources/org/sablecc/sablecc/lexer.txt
+++ b/src/main/resources/org/sablecc/sablecc/lexer.txt
@@ -64,9 +64,7 @@ public class Lexer
     }
 
     protected void filter() throws LexerException, IOException
-    {
-        // Do nothing
-    }
+    {}
 
     /**
      * @deprecated Override {@link #filter()} instead.
diff --git a/src/main/resources/org/sablecc/sablecc/parser.txt b/src/main/resources/org/sablecc/sablecc/parser.txt
index ba0027c0e181b57d79938f0df040b50657e18a20..ab8fbc09b5bc36e336cc41762629c3bb7359e39f 100644
--- a/src/main/resources/org/sablecc/sablecc/parser.txt
+++ b/src/main/resources/org/sablecc/sablecc/parser.txt
@@ -126,9 +126,7 @@ $
 
 Macro:ParserNoInliningPushHeader
     protected void filter() throws ParserException, LexerException, IOException
-    {
-        // Empty body
-    }
+    {}
 
     private void push(int numstate, List<Object> listNode, boolean hidden) throws ParserException, LexerException, IOException
     {
@@ -324,7 +322,6 @@ $
 
 Macro:ParserBraceOpening
         {
-            // Block
 
 $
 
diff --git a/src/main/resources/org/sablecc/sablecc/utils.txt b/src/main/resources/org/sablecc/sablecc/utils.txt
index 92ce0860324b63443c648c2b78dfd8457799d02a..b66f88376cef6ea262174bdc08c20777d2427173 100644
--- a/src/main/resources/org/sablecc/sablecc/utils.txt
+++ b/src/main/resources/org/sablecc/sablecc/utils.txt
@@ -18,9 +18,7 @@ public final class Start extends Node
     private EOF _eof_;
 
     public Start()
-    {
-        // Empty body
-    }
+    {}
 
     public Start(
         $1$ _$2$_,
@@ -420,9 +418,7 @@ Macro:Switch
 package $0$node;
 
 public interface Switch
-{
-    // Empty body
-}
+{}
 
 $