diff --git a/jode/jode/expr/CheckNullOperator.java b/jode/jode/expr/CheckNullOperator.java
index 74247b4..58ff4be 100644
--- a/jode/jode/expr/CheckNullOperator.java
+++ b/jode/jode/expr/CheckNullOperator.java
@@ -26,7 +26,7 @@ import jode.flow.VariableSet;
 ///#ifdef JDK12
 ///import java.util.Set;
 ///#else
-import jode.util.SimpleSet;
+import jode.util.Set;
 ///#endif
 
 /**
@@ -81,11 +81,7 @@ public class CheckNullOperator extends Operator {
 	super.fillInGenSet(in, gen);
     }
 
-///#ifdef JDK12
-///    public void fillDeclarables(Set used) {
-///#else
-    public void fillDeclarables(SimpleSet used) {
-///#endif
+    public void fillDeclarables(Set used) {
 	used.add(local);
 	super.fillDeclarables(used);
     }
diff --git a/jode/jode/expr/ConstructorOperator.java b/jode/jode/expr/ConstructorOperator.java
index ec74fa6..561d32d 100644
--- a/jode/jode/expr/ConstructorOperator.java
+++ b/jode/jode/expr/ConstructorOperator.java
@@ -35,7 +35,7 @@ import java.lang.reflect.Modifier;
 ///#ifdef JDK12
 ///import java.util.Set;
 ///#else
-import jode.util.SimpleSet;
+import jode.util.Set;
 ///#endif
 
 public class ConstructorOperator extends Operator 
@@ -169,11 +169,7 @@ public class ConstructorOperator extends Operator
      * We add the named method scoped classes to the declarables, and
      * only fillDeclarables on the parameters we will print.
      */
-///#ifdef JDK12
-///    public void fillDeclarables(Set used) {
-///#else
-    public void fillDeclarables(SimpleSet used) {
-///#endif
+    public void fillDeclarables(Set used) {
 	ClassInfo clazz = getClassInfo();
 	InnerClassInfo outer = getOuterClassInfo(clazz);
 	ClassAnalyzer clazzAna = methodAnalyzer.getClassAnalyzer(clazz);
diff --git a/jode/jode/expr/Expression.java b/jode/jode/expr/Expression.java
index 1d099f2..52d14d9 100644
--- a/jode/jode/expr/Expression.java
+++ b/jode/jode/expr/Expression.java
@@ -26,7 +26,7 @@ import jode.flow.VariableSet;
 ///#ifdef JDK12
 ///import java.util.Set;
 ///#else
-import jode.util.SimpleSet;
+import jode.util.Set;
 ///#endif
 
 public abstract class Expression {
@@ -232,11 +232,7 @@ public abstract class Expression {
     public void fillInGenSet(VariableSet in, VariableSet gen) {
     }
 
-///#ifdef JDK12
-///    public void fillDeclarables(Set used) {
-///#else
-    public void fillDeclarables(SimpleSet used) {
-///#endif
+    public void fillDeclarables(Set used) {
     }
 
     public abstract void dumpExpression(TabbedPrintWriter writer) 
diff --git a/jode/jode/expr/Operator.java b/jode/jode/expr/Operator.java
index 2438d5c..0f8fd33 100644
--- a/jode/jode/expr/Operator.java
+++ b/jode/jode/expr/Operator.java
@@ -26,7 +26,7 @@ import jode.flow.VariableSet;
 ///#ifdef JDK12
 ///import java.util.Set;
 ///#else
-import jode.util.SimpleSet;
+import jode.util.Set;
 ///#endif
 
 public abstract class Operator extends Expression {
@@ -176,11 +176,7 @@ public abstract class Operator extends Expression {
 	    subExpressions[i].fillInGenSet(in,gen);
     }
 
-///#ifdef JDK12
-///    public void fillDeclarables(Set used) {
-///#else
-    public void fillDeclarables(SimpleSet used) {
-///#endif
+    public void fillDeclarables(Set used) {
 	if (this instanceof LocalVarOperator) {
 	    used.add(((LocalVarOperator) this).getLocalInfo());
 	}