diff --git a/src/main/java/org/sablecc/sablecc/AltTransformAdapter.java b/src/main/java/org/sablecc/sablecc/AltTransformAdapter.java
index e5be2d29bd0df71c6b47a06d82c4e2b1449c5cb5..8d215b12c7fc4a7c59650754e9cc4a480f29c334 100644
--- a/src/main/java/org/sablecc/sablecc/AltTransformAdapter.java
+++ b/src/main/java/org/sablecc/sablecc/AltTransformAdapter.java
@@ -19,12 +19,12 @@ public class AltTransformAdapter extends DepthFirstAdapter
 
   private Map<String, String> isElementIsAlist;
 
-  private LinkedList listSimpleTermTransform;
+  private List<Node> listSimpleTermTransform;
   private Map<Node, String> simpleTermTransform;
   private Map<Node, String> simpleTermOrsimpleListTermTypes;
 
   AltTransformAdapter(Map<Node, String> simpleTermTransform,
-                      LinkedList listSimpleTermTransform,
+                      List<Node> listSimpleTermTransform,
                       String currentNewAltName,
                       ResolveAltIds altIds, Map<String, String> isElementIsAlist,
                       Map<Node, String> simpleTermOrsimpleListTermTypes)
diff --git a/src/main/java/org/sablecc/sablecc/GenParser.java b/src/main/java/org/sablecc/sablecc/GenParser.java
index c47721a4bd93ca15a2f1493b81bc9b502f61b5cd..5a108046e7367b8a1e050b501e64c59636b53c7b 100644
--- a/src/main/java/org/sablecc/sablecc/GenParser.java
+++ b/src/main/java/org/sablecc/sablecc/GenParser.java
@@ -67,7 +67,7 @@ public class GenParser extends DepthFirstAdapter
   //This tree-walker field generate the code of parsing and construction of the AST.
   GenerateAlternativeCodeForParser aParsedAltAdapter;
 
-  private LinkedList listSimpleTermTransform = new LinkedList();
+  private List<Node> listSimpleTermTransform = new LinkedList<>();
 
   public final Map<Node, String> simpleTermTransform = new HashMap<>();
 
diff --git a/src/main/java/org/sablecc/sablecc/GenerateAlternativeCodeForParser.java b/src/main/java/org/sablecc/sablecc/GenerateAlternativeCodeForParser.java
index 06a60a5a5dc2bf039bbc823fc7928b632c458f9b..ba2dfea5a1f9ba129217a6857a8a989781062639 100644
--- a/src/main/java/org/sablecc/sablecc/GenerateAlternativeCodeForParser.java
+++ b/src/main/java/org/sablecc/sablecc/GenerateAlternativeCodeForParser.java
@@ -27,7 +27,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter
   private ComputeSimpleTermPosition CTP;
   private MacroExpander macros;
   private Map<Node, String> simpleTermTransformMap;
-  private LinkedList listSimpleTermTransform;
+  private List<Node> listSimpleTermTransform;
   private Map<Node, String> simpleTermOrsimpleListTermTypes;
 
   private int popCount;
@@ -40,7 +40,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter
                                    ComputeSimpleTermPosition CTP,
                                    Map simpleTermTransformMap,
                                    MacroExpander macros,
-                                   LinkedList listSimpleTermTransform,
+                                   List<Node> listSimpleTermTransform,
                                    Map<Node, String> simpleTermOrsimpleListTermTypes)
   {
     this.pkgDir = pkgDir;
@@ -219,6 +219,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter
 
       if(node.getSimpleTermTail() != null )
       {
+        // FIXME This condition is always false, because listSimpleTermTransform contains ASimpleTerm/ASimpleListTerm and not String! Is it safe to remove this?
         if( !listSimpleTermTransform.contains(node.getId().getText() ) )
         {
           String type = CTP.positionsMap.get( realcurrentAlt+"."+node.getId().getText() );
@@ -294,6 +295,7 @@ public class GenerateAlternativeCodeForParser extends DepthFirstAdapter
 
       if(node.getSimpleTermTail() != null )
       {
+        // FIXME This condition is always false, because listSimpleTermTransform contains ASimpleTerm/ASimpleListTerm and not String! Is it safe to remove this?
         if( !listSimpleTermTransform.contains(node.getId().getText()) )
         {
           String type = CTP.positionsMap.get( realcurrentAlt+"."+node.getId().getText() );
diff --git a/src/main/java/org/sablecc/sablecc/InternalTransformationsToGrammar.java b/src/main/java/org/sablecc/sablecc/InternalTransformationsToGrammar.java
index 874d513122f11c24b3f14df39329fd810735230b..7f3e3011aa6162da091921fdd081d2cb44a1ef8d 100644
--- a/src/main/java/org/sablecc/sablecc/InternalTransformationsToGrammar.java
+++ b/src/main/java/org/sablecc/sablecc/InternalTransformationsToGrammar.java
@@ -40,7 +40,7 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
   int count;
   int elem;
 
-  private LinkedList listSimpleTermTransform;
+  private List<Node> listSimpleTermTransform;
 
   public final Map<Node, String> simpleTermTransform;
   Map<String, List<PElem>> mapProductionTransformations;
@@ -52,7 +52,7 @@ public class InternalTransformationsToGrammar extends DepthFirstAdapter
 
   public InternalTransformationsToGrammar(ResolveIds ids, ResolveAltIds altIds,
                                           ResolveTransformIds transformIds,
-                                          LinkedList listSimpleTermTransform,
+                                          List<Node> listSimpleTermTransform,
                                           Map<Node, String> simpleTermTransform,
                                           Map<String, List<PElem>> mapProductionTransformations,
                                           Map<Node, String> simpleTermOrsimpleListTermTypes)