diff --git a/src/main/org/apache/tools/ant/Target.java b/src/main/org/apache/tools/ant/Target.java
index a26f5c8a8..43846fd25 100644
--- a/src/main/org/apache/tools/ant/Target.java
+++ b/src/main/org/apache/tools/ant/Target.java
@@ -135,10 +135,10 @@ public class Target implements TaskContainer {
         }
     }
 
-    public static List/*<String>*/ parseDepends(String depends,
+    public static List<String> parseDepends(String depends,
                                                 String targetName,
                                                 String attributeName) {
-        ArrayList list = new ArrayList();
+        List<String> list = new ArrayList<String>();
         if (depends.length() > 0) {
             StringTokenizer tok =
                 new StringTokenizer(depends, ",", true);
diff --git a/src/main/org/apache/tools/ant/TaskConfigurationChecker.java b/src/main/org/apache/tools/ant/TaskConfigurationChecker.java
index 4aef6be73..e8e74441a 100644
--- a/src/main/org/apache/tools/ant/TaskConfigurationChecker.java
+++ b/src/main/org/apache/tools/ant/TaskConfigurationChecker.java
@@ -18,7 +18,6 @@
 package org.apache.tools.ant;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -56,7 +55,7 @@ import java.util.List;
 public class TaskConfigurationChecker {
 
     /** List of all collected error messages. */
-    private List/*<String>*/ errors = new ArrayList();
+    private List<String> errors = new ArrayList<String>();
 
     /** Task for which the configuration should be checked. */
     private final Task task;
@@ -100,8 +99,7 @@ public class TaskConfigurationChecker {
             sb.append(task.getTaskName());
             sb.append(">:");
             sb.append(System.getProperty("line.separator"));
-            for (Iterator it = errors.iterator(); it.hasNext();) {
-                String msg = (String) it.next();
+            for (String msg : errors) {
                 sb.append("- ");
                 sb.append(msg);
                 sb.append(System.getProperty("line.separator"));
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index 8ec0f0bde..bc35b1b7e 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -1035,11 +1035,7 @@ public class ProjectHelper2 extends ProjectHelper {
                 ProjectHelper helper =
                     (ProjectHelper) context.getProject().
                     getReference(ProjectHelper.PROJECTHELPER_REFERENCE);
-                for (Iterator iter =
-                         Target.parseDepends(extensionPoint, name, "extensionOf")
-                         .iterator();
-                     iter.hasNext(); ) {
-                    String tgName = (String) iter.next();
+                for (String tgName : Target.parseDepends(extensionPoint, name, "extensionOf")) {
                     if (isInIncludeMode()) {
                         tgName = prefix + sep + tgName;
                     }