diff --git a/src/main/java/org/sablecc/sablecc/node/AAlt.java b/src/main/java/org/sablecc/sablecc/node/AAlt.java
index b856c3eaf36734c28905803d21371f756729bb25..46fa13efb215524e39975d042ef80890130c29c6 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAlt.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAlt.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AAlt extends PAlt
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AAltTransform.java b/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
index c5019988f531d42b3479d45fc5ba03dd18726605..40ae9973af24d27c45cd43fc02484dba18b09bbf 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAltTransform.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AAltTransform extends PAltTransform
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AAst.java b/src/main/java/org/sablecc/sablecc/node/AAst.java
index e27ff6ffff77d114cbb99cc3cb5fea8693a90136..82a3c2876bc2907d96d2f6ffbdf1d0190e02adad 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAst.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAst.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AAst extends PAst
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AAstAlt.java b/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
index 3b59880930fb1b652fc6f53ea2ef4f221a199fa5..57f8d822fb9c402b9490579d65dc7194b95e2307 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAstAlt.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AAstAlt extends PAstAlt
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AAstProd.java b/src/main/java/org/sablecc/sablecc/node/AAstProd.java
index a903a330bbbb8a9d4a0a860e85546dec5ca5607f..9548aa5c410d1b1c132f36901b7234623a328b9d 100644
--- a/src/main/java/org/sablecc/sablecc/node/AAstProd.java
+++ b/src/main/java/org/sablecc/sablecc/node/AAstProd.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AAstProd extends PAstProd
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ACharBasic.java b/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
index e2c2c290835a2f9a2063c212bfd8ffc0fcf1e239..270a06ccf7ec1b69314995cab75ce6f938004850 100644
--- a/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ACharBasic.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ACharBasic extends PBasic
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ACharChar.java b/src/main/java/org/sablecc/sablecc/node/ACharChar.java
index c843556274ff14ff8c5ed26eba4085bce641344a..0b11b64769f5fa9c142f2706d4b42d6130475707 100644
--- a/src/main/java/org/sablecc/sablecc/node/ACharChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/ACharChar.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ACharChar extends PChar
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AConcat.java b/src/main/java/org/sablecc/sablecc/node/AConcat.java
index 00173c37a7d18e475a5c3ee869bfe856f903d18f..76b5d87780c0df49b870396a3c78d555b2416c69 100644
--- a/src/main/java/org/sablecc/sablecc/node/AConcat.java
+++ b/src/main/java/org/sablecc/sablecc/node/AConcat.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AConcat extends PConcat
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ADecChar.java b/src/main/java/org/sablecc/sablecc/node/ADecChar.java
index 31c50336ad18ef60fe1ef63de05d70f27111b186..0778ae0ddededaffc90e221f3fb7e95999f2522a 100644
--- a/src/main/java/org/sablecc/sablecc/node/ADecChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/ADecChar.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ADecChar extends PChar
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AElem.java b/src/main/java/org/sablecc/sablecc/node/AElem.java
index 70985fa2053b5bd3e69a3d48e2e7d94c07881e34..f961acc6ee47ccaf2b0f8321abaac9e5f086912a 100644
--- a/src/main/java/org/sablecc/sablecc/node/AElem.java
+++ b/src/main/java/org/sablecc/sablecc/node/AElem.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AElem extends PElem
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AGrammar.java b/src/main/java/org/sablecc/sablecc/node/AGrammar.java
index e16f1d20d3df54e9480424c1f4025ffaf122c3b2..ef39aa3ef21844b05520fadbe17880fc8a2a9566 100644
--- a/src/main/java/org/sablecc/sablecc/node/AGrammar.java
+++ b/src/main/java/org/sablecc/sablecc/node/AGrammar.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AGrammar extends PGrammar
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AHelperDef.java b/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
index 872f966d1c3f06975db23d335cc41d9ea212b2fa..93742b973d0c4212ec8f6ede8ef1bb440714c74a 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHelperDef.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AHelperDef extends PHelperDef
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AHelpers.java b/src/main/java/org/sablecc/sablecc/node/AHelpers.java
index ded07034284527c733add5b914075a5e4a9c3c9c..f083aeccd7c11cb2ccae6722e3a713eb739de4fa 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHelpers.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHelpers.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AHelpers extends PHelpers
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AHexChar.java b/src/main/java/org/sablecc/sablecc/node/AHexChar.java
index 03913724395d8f7bee061d6a68c0bb2d8c8a0f8d..ea2c910d1d49ce0f9e927ca69e814ddf7c571c71 100644
--- a/src/main/java/org/sablecc/sablecc/node/AHexChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/AHexChar.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AHexChar extends PChar
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AIdBasic.java b/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
index 8ce3a09337bf32bc4de18b083f419640490b6f4b..2089831188cb12dc623730ec625934679b13fe73 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIdBasic.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AIdBasic extends PBasic
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java b/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
index ed818d02f933b039c6936e628b481317cd01b124..21caa3f72801410e9ea8f11c13f0e983c8c985aa 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIgnTokens.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AIgnTokens extends PIgnTokens
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java b/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
index dbd1b004938d96aba08682da410bcc1eb8e67293..aa6dcc6ab68b6d5744a714b694cef42c9855a0fb 100644
--- a/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
+++ b/src/main/java/org/sablecc/sablecc/node/AIntervalSet.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AIntervalSet extends PSet
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AListTerm.java b/src/main/java/org/sablecc/sablecc/node/AListTerm.java
index 6058e15341c48bdd850a763c3576942e55f4e358..d87e033f3da0e89daaac6f78d70067f30dfa5ac8 100644
--- a/src/main/java/org/sablecc/sablecc/node/AListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/AListTerm.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AListTerm extends PTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java b/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
index f83b25fd65f5487f1ec3b746148bafe2b0f221e5..d707ff0d2662fa874328e8dc072c94d7f50c1c31 100644
--- a/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AMinusBinOp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AMinusBinOp extends PBinOp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java b/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
index 55f4202b0dd5dc6cb88b89fbecf678eec068333e..0d3d8341d0b3d7c516dd49709a293b771b7f63a2 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANewListTerm.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ANewListTerm extends PListTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ANewTerm.java b/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
index 1726c713cf8faa60b3d7dc38f89c208c11e2800f..601f7923f6c48099cb2e481e81967218c5febde1 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANewTerm.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ANewTerm extends PTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ANullTerm.java b/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
index 7054505a7a1ef9ae63394fc304f87c6f2ae981a6..dcd1f7f03016cf85edbe33a38932573e96e1328a 100644
--- a/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ANullTerm.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ANullTerm extends PTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AOperationSet.java b/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
index d34ea9083b2320230c007b7ce205715ed0c1c8eb..0cd95937a665df7a27df7e5732e06737ada2b682 100644
--- a/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
+++ b/src/main/java/org/sablecc/sablecc/node/AOperationSet.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AOperationSet extends PSet
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java b/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
index 37600cb7b4a975622dde5b3c3a7a6bc09daf3c9c..653ce61752c9e7dc3b91309ea7d3b7e1a9eba008 100644
--- a/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/APlusBinOp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class APlusBinOp extends PBinOp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java b/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
index d31ac09b57b26ae668c4f218bc75b23ef6061ec5..c18ef1bf8d4d78a3a2446c86fa48518a6df6995a 100644
--- a/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/APlusUnOp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class APlusUnOp extends PUnOp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AProd.java b/src/main/java/org/sablecc/sablecc/node/AProd.java
index 961339d493443cf1755febff9ef8e586a9a46e9f..ffa7289bfcd677de1924216fcfefd6814d41f8aa 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProd.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProd.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AProd extends PProd
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AProdName.java b/src/main/java/org/sablecc/sablecc/node/AProdName.java
index 48d5ed27d687398584365e3eaec51a60f3897e83..f5be37eb0fc230b8a7f2e8ea97d6e1cab1659f59 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProdName.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProdName.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AProdName extends PProdName
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java b/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
index df84feb26a50114481a2831c23ce5703db629ebf..cccd16d36c56e44cec0f3b2f4e1d0c89f5ed859d 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProductionSpecifier.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AProductionSpecifier extends PSpecifier
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AProductions.java b/src/main/java/org/sablecc/sablecc/node/AProductions.java
index c26ba7c26825a855e7b6427cd5c76dda38be4c4b..f95ec5a099e09a9313a694432b1cc77957d6ccdf 100644
--- a/src/main/java/org/sablecc/sablecc/node/AProductions.java
+++ b/src/main/java/org/sablecc/sablecc/node/AProductions.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AProductions extends PProductions
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java b/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
index da78e8791a964e97e6b0ad7f2a4b67503a0d40ed..4eb1cc4b29b308c0134b3ecba3fbf68cbda994b0 100644
--- a/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AQMarkUnOp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AQMarkUnOp extends PUnOp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ARegExp.java b/src/main/java/org/sablecc/sablecc/node/ARegExp.java
index 8c053d869fa9f25b47ca930c91d003f32c5910de..ad35d8b27432e4a8df7c469cbf57c813aa1c6878 100644
--- a/src/main/java/org/sablecc/sablecc/node/ARegExp.java
+++ b/src/main/java/org/sablecc/sablecc/node/ARegExp.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ARegExp extends PRegExp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java b/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
index 1c29eec74ef24927e70082fbd0062f8fff48b504..8169e64fb913c1eddd618056d78d2c40d5e621c6 100644
--- a/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ARegExpBasic.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ARegExpBasic extends PBasic
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ASetBasic.java b/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
index 9c26ab094894d9991f42894ccab765ae515d4d50..10040dd0a0f43b69962f15b84ca873de2ba22bfb 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASetBasic.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ASetBasic extends PBasic
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java b/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
index 7821735cd82e0ac2cfd98073959ea2448ded3e47..2efef462828b5c08aeb359edd1b8b4555e2a1563 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASimpleListTerm.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ASimpleListTerm extends PListTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java b/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
index 693bea1fb73a5b757e3d08436fc9d46d14b8d8d3..1138d998a1cff02691ef3bd0ef93db955fa7a55e 100644
--- a/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
+++ b/src/main/java/org/sablecc/sablecc/node/ASimpleTerm.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ASimpleTerm extends PTerm
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java b/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
index 65146a48504d8ed4393b1648d5b9e97ca9006b22..9e6fa0d45701ebb7a8df44bd79112912bf7401f0 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStarUnOp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AStarUnOp extends PUnOp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AStateList.java b/src/main/java/org/sablecc/sablecc/node/AStateList.java
index 7954c68be0b2ac7635dce724d0366be11dea7019..7af91334ade49f4cd65670189bc7ae1e59bbc3e5 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStateList.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStateList.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AStateList extends PStateList
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AStateListTail.java b/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
index b07fbfcc87000a2dd5447b1fa408324ac0189454..748b9dbc23cffba22b88fbe63e2fc9c1ccfc72e0 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStateListTail.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AStateListTail extends PStateListTail
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AStates.java b/src/main/java/org/sablecc/sablecc/node/AStates.java
index f2708531c267618caababb1ea473c6a84ff89d83..a191372642bbec5fbb06e9ff08165297dc33dddf 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStates.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStates.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AStates extends PStates
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AStringBasic.java b/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
index 79963c2303490abda7f75c28d4befd4afe39b524..c52baeb47e15b7888ef5efd7a7a61330207613b1 100644
--- a/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
+++ b/src/main/java/org/sablecc/sablecc/node/AStringBasic.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AStringBasic extends PBasic
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokenDef.java b/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
index b2e423d3a805e98c22fa34324f1f0d8f73de1d21..21aa248d38b76ca0e804744122f3fd86e39bee7f 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokenDef.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ATokenDef extends PTokenDef
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java b/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
index 596e939289aa23f3a6dda76391f0258452049e66..4cabc05889acd10273cb4c0b519cf452a48b820d 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokenSpecifier.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ATokenSpecifier extends PSpecifier
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ATokens.java b/src/main/java/org/sablecc/sablecc/node/ATokens.java
index f07f1855c268cecb245c9c1f1ef0e63f15ef8aa2..d128831b37934f484e107628fdbaa0dee4726267 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATokens.java
@@ -6,8 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ATokens extends PTokens
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/ATransition.java b/src/main/java/org/sablecc/sablecc/node/ATransition.java
index e0c63282c9b02a058fac2f6e4cb6d636133d5e8c..efc2ecb8a722002ea320ef0a7b9e50dca51167cf 100644
--- a/src/main/java/org/sablecc/sablecc/node/ATransition.java
+++ b/src/main/java/org/sablecc/sablecc/node/ATransition.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class ATransition extends PTransition
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/AUnExp.java b/src/main/java/org/sablecc/sablecc/node/AUnExp.java
index ea2d1e39625a98a4d8b7c12bac7784127e3caf6e..30185f0ab743acb499845cb39bb5e8873b78e709 100644
--- a/src/main/java/org/sablecc/sablecc/node/AUnExp.java
+++ b/src/main/java/org/sablecc/sablecc/node/AUnExp.java
@@ -2,8 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
-
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class AUnExp extends PUnExp
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/EOF.java b/src/main/java/org/sablecc/sablecc/node/EOF.java
index db29f86d5d0e07a18ad1999eb9f2161513e5c877..8d7e017e119d18af04ebeca9e6e6f910dcd7a282 100644
--- a/src/main/java/org/sablecc/sablecc/node/EOF.java
+++ b/src/main/java/org/sablecc/sablecc/node/EOF.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class EOF extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/Start.java b/src/main/java/org/sablecc/sablecc/node/Start.java
index 0988c84f035f06138fea1ccbdf1097b123aa2a56..f9e230a62e8a6a7916ef4290b0f8aae8341c03bd 100644
--- a/src/main/java/org/sablecc/sablecc/node/Start.java
+++ b/src/main/java/org/sablecc/sablecc/node/Start.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class Start extends Node
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TAbstract.java b/src/main/java/org/sablecc/sablecc/node/TAbstract.java
index f66d260df160fce1dc63ce00967b7006fd1a32e0..ba9a91097dae626ad254bf4d4e5d9b7f11885fa6 100644
--- a/src/main/java/org/sablecc/sablecc/node/TAbstract.java
+++ b/src/main/java/org/sablecc/sablecc/node/TAbstract.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TAbstract extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TArrow.java b/src/main/java/org/sablecc/sablecc/node/TArrow.java
index a7ae84061e885f66118a69702aebdf13e8792124..9a2221108eff3e2ff7d6c4408d976f51f442fdb5 100644
--- a/src/main/java/org/sablecc/sablecc/node/TArrow.java
+++ b/src/main/java/org/sablecc/sablecc/node/TArrow.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TArrow extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TBar.java b/src/main/java/org/sablecc/sablecc/node/TBar.java
index 7b3d24df70d21ccda4eddc0581f619e2e101b114..36d967f0f6ad392ed88026d04571a2e369b8b088 100644
--- a/src/main/java/org/sablecc/sablecc/node/TBar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TBar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TBar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TBlank.java b/src/main/java/org/sablecc/sablecc/node/TBlank.java
index 3a9bcccc87e705d92dccc5d4951a8990de8be849..de51cb91f026c3706c08738e36dad023cca4f31c 100644
--- a/src/main/java/org/sablecc/sablecc/node/TBlank.java
+++ b/src/main/java/org/sablecc/sablecc/node/TBlank.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TBlank extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TChar.java b/src/main/java/org/sablecc/sablecc/node/TChar.java
index 580f2ba223d3c65f80e749915869dbfddb1c4508..aecb775ca04dbf1cb0fa709c0c80c37adbdd289e 100644
--- a/src/main/java/org/sablecc/sablecc/node/TChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TChar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TChar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TColon.java b/src/main/java/org/sablecc/sablecc/node/TColon.java
index 2747eb1dbf8d9d3a854eba2bdafc0a1ac639ed70..76e6ae69214ea2345d1683deb945ac071769d75f 100644
--- a/src/main/java/org/sablecc/sablecc/node/TColon.java
+++ b/src/main/java/org/sablecc/sablecc/node/TColon.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TColon extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TComma.java b/src/main/java/org/sablecc/sablecc/node/TComma.java
index bd6d1d65cbfbdead3a3c9f4b37bf744b031f08c8..485b422a4c9a088306c527ebaab3286e13c1a010 100644
--- a/src/main/java/org/sablecc/sablecc/node/TComma.java
+++ b/src/main/java/org/sablecc/sablecc/node/TComma.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TComma extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TComment.java b/src/main/java/org/sablecc/sablecc/node/TComment.java
index 11741341b5432fccc74ab0441fd9201d4f46dfbc..9f9f1a52e64a25d5f27e6d676d6c53908a02f3eb 100644
--- a/src/main/java/org/sablecc/sablecc/node/TComment.java
+++ b/src/main/java/org/sablecc/sablecc/node/TComment.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TComment extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TDDot.java b/src/main/java/org/sablecc/sablecc/node/TDDot.java
index 2d3f331abed5827cbb6f71168a2ab37de0017d0c..0c2dd1f54cec3ca9429da62499093792f12fcec5 100644
--- a/src/main/java/org/sablecc/sablecc/node/TDDot.java
+++ b/src/main/java/org/sablecc/sablecc/node/TDDot.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TDDot extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TDecChar.java b/src/main/java/org/sablecc/sablecc/node/TDecChar.java
index e2d371d3f8d2c10b2e34e8cbc99a03ba846f7624..22104e3f91115ac6cb8f78933abdab1619c149dd 100644
--- a/src/main/java/org/sablecc/sablecc/node/TDecChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TDecChar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TDecChar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TDot.java b/src/main/java/org/sablecc/sablecc/node/TDot.java
index d70aab4c8e834e6b0c53743bc539073c798b1730..394e43fad398c48a2557843d1629672b62febd73 100644
--- a/src/main/java/org/sablecc/sablecc/node/TDot.java
+++ b/src/main/java/org/sablecc/sablecc/node/TDot.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TDot extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TEqual.java b/src/main/java/org/sablecc/sablecc/node/TEqual.java
index 45267a6fd4831f5d64b86450e1939c2199e595ed..c5b4c7c7ebfacb1cfb3fe71b159263b20eb0ad58 100644
--- a/src/main/java/org/sablecc/sablecc/node/TEqual.java
+++ b/src/main/java/org/sablecc/sablecc/node/TEqual.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TEqual extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/THelpers.java b/src/main/java/org/sablecc/sablecc/node/THelpers.java
index 73a6bf93474fcc602a201a683aa06c5e972e94b9..27b296643b6d1d6a265ce6c282a7eaf899f833e5 100644
--- a/src/main/java/org/sablecc/sablecc/node/THelpers.java
+++ b/src/main/java/org/sablecc/sablecc/node/THelpers.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class THelpers extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/THexChar.java b/src/main/java/org/sablecc/sablecc/node/THexChar.java
index 7f9a467ff46ee1c7617d9ae90684e4fc6d4a9804..2b09dc0d88ab19560397df0b41dbfab78b8c5ccc 100644
--- a/src/main/java/org/sablecc/sablecc/node/THexChar.java
+++ b/src/main/java/org/sablecc/sablecc/node/THexChar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class THexChar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TId.java b/src/main/java/org/sablecc/sablecc/node/TId.java
index 2358ae4e1b3fecf270f8392b0f112482567cb988..4323e68cb24f7454b0efae7c78019c850a5a2ea7 100644
--- a/src/main/java/org/sablecc/sablecc/node/TId.java
+++ b/src/main/java/org/sablecc/sablecc/node/TId.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TId extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TIgnored.java b/src/main/java/org/sablecc/sablecc/node/TIgnored.java
index 650d981e9e4cafe098c1a4204a236d3b52a96959..3512dee9b0c0362c7c73071d6776b4aa7d20b318 100644
--- a/src/main/java/org/sablecc/sablecc/node/TIgnored.java
+++ b/src/main/java/org/sablecc/sablecc/node/TIgnored.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TIgnored extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TLBkt.java b/src/main/java/org/sablecc/sablecc/node/TLBkt.java
index 162c1e399233eae8551205797b51edacf21e6ad3..8e5a83766b396eb6532f5fc8d0f6f8a0c97fb9b2 100644
--- a/src/main/java/org/sablecc/sablecc/node/TLBkt.java
+++ b/src/main/java/org/sablecc/sablecc/node/TLBkt.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TLBkt extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TLBrace.java b/src/main/java/org/sablecc/sablecc/node/TLBrace.java
index 463e48bb95934bd17186c4fa737fa7ad0d63e0c9..a3dcb1575de2416c633b7d8db73928ab2aa42c47 100644
--- a/src/main/java/org/sablecc/sablecc/node/TLBrace.java
+++ b/src/main/java/org/sablecc/sablecc/node/TLBrace.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TLBrace extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TLPar.java b/src/main/java/org/sablecc/sablecc/node/TLPar.java
index ed5fca6f52da36531009ae344bae5dc746a8f7ae..8ba1e87a8b3fa02e5c843ad25c5ce11c91ab1b14 100644
--- a/src/main/java/org/sablecc/sablecc/node/TLPar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TLPar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TLPar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TMinus.java b/src/main/java/org/sablecc/sablecc/node/TMinus.java
index 2c9f4eb87c921011279e0349036fce4e12f7d410..044d65cb72357e26aff5acb55e533c398e16b61e 100644
--- a/src/main/java/org/sablecc/sablecc/node/TMinus.java
+++ b/src/main/java/org/sablecc/sablecc/node/TMinus.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TMinus extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TNew.java b/src/main/java/org/sablecc/sablecc/node/TNew.java
index 4a0ad795e8dcba6bdf0b308aba35708c46e2537f..fcbcd3051c396bbedb10d79dcaeeba73e9f77c2b 100644
--- a/src/main/java/org/sablecc/sablecc/node/TNew.java
+++ b/src/main/java/org/sablecc/sablecc/node/TNew.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TNew extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TNull.java b/src/main/java/org/sablecc/sablecc/node/TNull.java
index 8e34cb3a1f713970c00a8cfee00dec08900b1f71..47800bb7583b204c45f4d5bca5239993d1678724 100644
--- a/src/main/java/org/sablecc/sablecc/node/TNull.java
+++ b/src/main/java/org/sablecc/sablecc/node/TNull.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TNull extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TPackage.java b/src/main/java/org/sablecc/sablecc/node/TPackage.java
index 05d320ddbbd82f260249ae123fc2a93d80276aed..b2854d6dd99d1a3fc4ca87afcb3917aa14a52a5e 100644
--- a/src/main/java/org/sablecc/sablecc/node/TPackage.java
+++ b/src/main/java/org/sablecc/sablecc/node/TPackage.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TPackage extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TPkgId.java b/src/main/java/org/sablecc/sablecc/node/TPkgId.java
index 4fd244121edcbfc554b6b62c9851ef04a27dbaa2..63fd17a18c15cba74a84fd15acf5fb0993984f36 100644
--- a/src/main/java/org/sablecc/sablecc/node/TPkgId.java
+++ b/src/main/java/org/sablecc/sablecc/node/TPkgId.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TPkgId extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TPlus.java b/src/main/java/org/sablecc/sablecc/node/TPlus.java
index e3416089c15011f990f33ea5e27959aafd4e40d5..5098ea0560ef1e54035439e42cf132fcb4afcc76 100644
--- a/src/main/java/org/sablecc/sablecc/node/TPlus.java
+++ b/src/main/java/org/sablecc/sablecc/node/TPlus.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TPlus extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java b/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java
index fca83af68ee36e4829a0261b5373a7c4c1a131e7..35a585fa6be8e2e87fc5f860682ba4b287f3b1ef 100644
--- a/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/TProductionSpecifier.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TProductionSpecifier extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TProductions.java b/src/main/java/org/sablecc/sablecc/node/TProductions.java
index 4c638eddcabf3e2430e0a3e45e3d14d9350170ae..7f402c305d92a37de0e92f4eabe7fb87c7626215 100644
--- a/src/main/java/org/sablecc/sablecc/node/TProductions.java
+++ b/src/main/java/org/sablecc/sablecc/node/TProductions.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TProductions extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TQMark.java b/src/main/java/org/sablecc/sablecc/node/TQMark.java
index caf4b18ddf178f7032a2af1b9013831d46b5d8bb..aebf492424c824f49c0e2c0d80dc133174d7d1e1 100644
--- a/src/main/java/org/sablecc/sablecc/node/TQMark.java
+++ b/src/main/java/org/sablecc/sablecc/node/TQMark.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TQMark extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TRBkt.java b/src/main/java/org/sablecc/sablecc/node/TRBkt.java
index af3b0d0cdc3cabce900358fa2478a73c0706c1c4..30552da69e821b2614bd4c7e1ca175c4aeac9f2e 100644
--- a/src/main/java/org/sablecc/sablecc/node/TRBkt.java
+++ b/src/main/java/org/sablecc/sablecc/node/TRBkt.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TRBkt extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TRBrace.java b/src/main/java/org/sablecc/sablecc/node/TRBrace.java
index 1fea9e0fb889e2713b42b91723250774416a51f9..04be2a1ce6914e3e527354e4998b865d82334a22 100644
--- a/src/main/java/org/sablecc/sablecc/node/TRBrace.java
+++ b/src/main/java/org/sablecc/sablecc/node/TRBrace.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TRBrace extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TRPar.java b/src/main/java/org/sablecc/sablecc/node/TRPar.java
index acd235f46ee293870a67be3f236360d79ca226fb..c797774a6b97505a112fcae761b2c370b85d0253 100644
--- a/src/main/java/org/sablecc/sablecc/node/TRPar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TRPar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TRPar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TSemicolon.java b/src/main/java/org/sablecc/sablecc/node/TSemicolon.java
index 31b4ad2f2a6bcde8444e01daebc3a4306ab3704d..144ab07845bd29b7997b497c862c3b5eaecfa03f 100644
--- a/src/main/java/org/sablecc/sablecc/node/TSemicolon.java
+++ b/src/main/java/org/sablecc/sablecc/node/TSemicolon.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TSemicolon extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TSlash.java b/src/main/java/org/sablecc/sablecc/node/TSlash.java
index fd8ed5672a175700d64df11c7ead8e7b25868052..6b2fd73cabe1766d0ed39edc1709bf805171707e 100644
--- a/src/main/java/org/sablecc/sablecc/node/TSlash.java
+++ b/src/main/java/org/sablecc/sablecc/node/TSlash.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TSlash extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TStar.java b/src/main/java/org/sablecc/sablecc/node/TStar.java
index 812ff234e709d76401105f1241da3c041fd176e5..c6835917372b09655346de4ac99dcb25049a9e9a 100644
--- a/src/main/java/org/sablecc/sablecc/node/TStar.java
+++ b/src/main/java/org/sablecc/sablecc/node/TStar.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TStar extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TStates.java b/src/main/java/org/sablecc/sablecc/node/TStates.java
index 18efef1e44c9f82b1085a3bb30a0f2f1b3a5a85a..45a75a7d67ae34613f9fef0e7097ae668e90b4b2 100644
--- a/src/main/java/org/sablecc/sablecc/node/TStates.java
+++ b/src/main/java/org/sablecc/sablecc/node/TStates.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TStates extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TString.java b/src/main/java/org/sablecc/sablecc/node/TString.java
index d328437c04d61df324f217bc7926016107220856..452162ec67d17fcc5919c4dcf653914157854a8f 100644
--- a/src/main/java/org/sablecc/sablecc/node/TString.java
+++ b/src/main/java/org/sablecc/sablecc/node/TString.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TString extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TSyntax.java b/src/main/java/org/sablecc/sablecc/node/TSyntax.java
index fc898d04f66e3803779caa8beb50644a51fc0748..4e7340f7cc74d3296083ecbf6b18d32ed6c93df2 100644
--- a/src/main/java/org/sablecc/sablecc/node/TSyntax.java
+++ b/src/main/java/org/sablecc/sablecc/node/TSyntax.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TSyntax extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java b/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java
index dab322575953849354ddd026eacb91c41f7cb479..b37b101e402c4fa9ab8c59732cbdebfbf3d63945 100644
--- a/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java
+++ b/src/main/java/org/sablecc/sablecc/node/TTokenSpecifier.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TTokenSpecifier extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TTokens.java b/src/main/java/org/sablecc/sablecc/node/TTokens.java
index ae2f7a001f6cb6c507f2d18ad8d6c2276a6712da..fac6c7a7fa5c7d2d5aa8fe141bfe7efc54438817 100644
--- a/src/main/java/org/sablecc/sablecc/node/TTokens.java
+++ b/src/main/java/org/sablecc/sablecc/node/TTokens.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TTokens extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/node/TTree.java b/src/main/java/org/sablecc/sablecc/node/TTree.java
index e168bc9422c8002647555821b47515f245d691d2..91100d31f153e753b65ce43dc2265debaae123a4 100644
--- a/src/main/java/org/sablecc/sablecc/node/TTree.java
+++ b/src/main/java/org/sablecc/sablecc/node/TTree.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.node;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.Analysis;
 
 public final class TTree extends Token
 {
diff --git a/src/main/java/org/sablecc/sablecc/parser/Parser.java b/src/main/java/org/sablecc/sablecc/parser/Parser.java
index 051bcc2eed7999eced2001641b9b85bb459aa31c..a5f017486eb7566db6f6dac4c1ef2384dde835f1 100644
--- a/src/main/java/org/sablecc/sablecc/parser/Parser.java
+++ b/src/main/java/org/sablecc/sablecc/parser/Parser.java
@@ -18,7 +18,8 @@ import de.hhu.stups.sablecc.patch.IToken;
 import de.hhu.stups.sablecc.patch.PositionedNode;
 import de.hhu.stups.sablecc.patch.SourcecodeRange;
 
-import org.sablecc.sablecc.lexer.*;
+import org.sablecc.sablecc.lexer.Lexer;
+import org.sablecc.sablecc.lexer.LexerException;
 import org.sablecc.sablecc.node.*;
 
 @SuppressWarnings({"rawtypes","unchecked","unused"})
diff --git a/src/main/java/org/sablecc/sablecc/parser/TokenIndex.java b/src/main/java/org/sablecc/sablecc/parser/TokenIndex.java
index 65801152a768e119dbadbb1fa79b1158406dd91a..37018e91c4a005878bfef1e20be1bb24de9dfd76 100644
--- a/src/main/java/org/sablecc/sablecc/parser/TokenIndex.java
+++ b/src/main/java/org/sablecc/sablecc/parser/TokenIndex.java
@@ -2,7 +2,7 @@
 
 package org.sablecc.sablecc.parser;
 
-import org.sablecc.sablecc.analysis.*;
+import org.sablecc.sablecc.analysis.AnalysisAdapter;
 import org.sablecc.sablecc.node.*;
 
 class TokenIndex extends AnalysisAdapter
diff --git a/src/main/resources/org/sablecc/sablecc/alternatives.txt b/src/main/resources/org/sablecc/sablecc/alternatives.txt
index 4b15e03f13ddd7e6fe9d2d6bc5b9148dc88f6d22..e5cd53d8497334fc0007e806b445a7ea5cf89158 100644
--- a/src/main/resources/org/sablecc/sablecc/alternatives.txt
+++ b/src/main/resources/org/sablecc/sablecc/alternatives.txt
@@ -22,8 +22,7 @@ import java.util.ListIterator;
 $
 
 Macro:AlternativeHeader2
-import $0$analysis.*;
-
+import $0$analysis.Analysis;
 
 public final class $1$ extends $2$
 {
diff --git a/src/main/resources/org/sablecc/sablecc/parser.txt b/src/main/resources/org/sablecc/sablecc/parser.txt
index 8bf2baae24ce9d937a0e9791b102ead3b3198153..f5b39aa373c285e46bb9aca3de684250dac8d7dd 100644
--- a/src/main/resources/org/sablecc/sablecc/parser.txt
+++ b/src/main/resources/org/sablecc/sablecc/parser.txt
@@ -26,7 +26,8 @@ import de.hhu.stups.sablecc.patch.IToken;
 import de.hhu.stups.sablecc.patch.PositionedNode;
 import de.hhu.stups.sablecc.patch.SourcecodeRange;
 
-import $0$lexer.*;
+import $0$lexer.Lexer;
+import $0$lexer.LexerException;
 import $0$node.*;
 
 @SuppressWarnings({"rawtypes","unchecked","unused"})
@@ -582,7 +583,7 @@ Macro:TokenIndexHeader
 
 package $0$parser;
 
-import $0$analysis.*;
+import $0$analysis.AnalysisAdapter;
 import $0$node.*;
 
 class TokenIndex extends AnalysisAdapter
diff --git a/src/main/resources/org/sablecc/sablecc/tokens.txt b/src/main/resources/org/sablecc/sablecc/tokens.txt
index 32f9cd4d442820c25867a8a3b090d09cfbf92a76..ce4cfbc9f63af4e19bf0140f6e7030a1b4421c31 100644
--- a/src/main/resources/org/sablecc/sablecc/tokens.txt
+++ b/src/main/resources/org/sablecc/sablecc/tokens.txt
@@ -10,7 +10,7 @@ Macro:VariableTextToken
 
 package $0$node;
 
-import $0$analysis.*;
+import $0$analysis.Analysis;
 
 public final class $1$ extends Token
 {
@@ -49,7 +49,7 @@ Macro:FixedTextToken
 
 package $0$node;
 
-import $0$analysis.*;
+import $0$analysis.Analysis;
 
 public final class $1$ extends Token
 {
diff --git a/src/main/resources/org/sablecc/sablecc/utils.txt b/src/main/resources/org/sablecc/sablecc/utils.txt
index 4e4e20d563d97fa075e0e84a5d514ac5adbc3e08..92ce0860324b63443c648c2b78dfd8457799d02a 100644
--- a/src/main/resources/org/sablecc/sablecc/utils.txt
+++ b/src/main/resources/org/sablecc/sablecc/utils.txt
@@ -10,7 +10,7 @@ Macro:Start
 
 package $0$node;
 
-import $0$analysis.*;
+import $0$analysis.Analysis;
 
 public final class Start extends Node
 {
@@ -151,7 +151,7 @@ Macro:EOF
 
 package $0$node;
 
-import $0$analysis.*;
+import $0$analysis.Analysis;
 
 public final class EOF extends Token
 {