diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 31ee8405c..599aa0b62 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -166,7 +166,7 @@ public class ProjectHelper {
      * of the target and the third the name of the enum like class
      * {@link OnMissingExtensionPoint}.
      */
-    public List getExtensionStack() {
+    public List<String[]> getExtensionStack() {
         return extensionStack;
     }
 
diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
index bc35b1b7e..fc204c5af 100644
--- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
+++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
@@ -180,8 +180,7 @@ public class ProjectHelper2 extends ProjectHelper {
             context.getImplicitTarget().execute();
 
             // resolve extensionOf attributes
-            for (Iterator i = getExtensionStack().iterator(); i.hasNext(); ) {
-                String[] extensionInfo = (String[]) i.next();
+            for (String[] extensionInfo : getExtensionStack()) {
                 String tgName = extensionInfo[0];
                 String name = extensionInfo[1];
                 OnMissingExtensionPoint missingBehaviour = OnMissingExtensionPoint