diff --git a/openide.dialogs/src/org/openide/WizardDescriptor.java b/openide.dialogs/src/org/openide/WizardDescriptor.java
--- a/openide.dialogs/src/org/openide/WizardDescriptor.java
+++ b/openide.dialogs/src/org/openide/WizardDescriptor.java
@@ -1766,9 +1766,10 @@
      * (This interface can replace
      * <a href="@OPENIDE/LOADERS@/org/openide/loaders/TemplateWizard.Iterator.html"><code>TemplateWizard.Iterator</code></a>
      * in a template's declaration.)
+     * @param <Ignored> irrelevant; the data type is always {@link WizardDescriptor}
      * @since org.openide/1 4.33
      */
-    public interface InstantiatingIterator<Data> extends Iterator<Data> {
+    public interface InstantiatingIterator<Ignored> extends Iterator<WizardDescriptor> {
         /** Returns set of instantiated objects. If instantiation fails then wizard remains open to enable correct values.
          *
          * @throws IOException
@@ -1795,9 +1796,10 @@
      * (This interface can replace
      * <a href="@OPENIDE/LOADERS@/org/openide/loaders/TemplateWizard.Iterator.html"><code>TemplateWizard.Iterator</code></a>
      * in a template's declaration.)
+     * @param <Ignored> irrelevant; the data type is always {@link WizardDescriptor}
      * @since org.openide/1 6.5
      */
-    public interface AsynchronousInstantiatingIterator<Data> extends InstantiatingIterator<Data> {
+    public interface AsynchronousInstantiatingIterator<Ignored> extends InstantiatingIterator<Ignored> {
 
         /**
          * Is called in separate thread when the Finish button
@@ -1817,9 +1819,10 @@
      * (This interface can replace
      * <a href="@OPENIDE/LOADERS@/org/openide/loaders/TemplateWizard.Iterator.html"><code>TemplateWizard.Iterator</code></a>
      * in a template's declaration.)
+     * @param <Ignored> irrelevant; the data type is always {@link WizardDescriptor}
      * @since org.openide.dialogs 7.1
      */
-    public interface ProgressInstantiatingIterator<Data> extends AsynchronousInstantiatingIterator<Data> {
+    public interface ProgressInstantiatingIterator<Ignored> extends AsynchronousInstantiatingIterator<Ignored> {
 
         /**
          * Is called in separate thread when the Finish button
diff --git a/openide.loaders/src/org/openide/loaders/TemplateWizard.java b/openide.loaders/src/org/openide/loaders/TemplateWizard.java
--- a/openide.loaders/src/org/openide/loaders/TemplateWizard.java
+++ b/openide.loaders/src/org/openide/loaders/TemplateWizard.java
@@ -681,7 +681,6 @@
     * @param obj the data object
     * @return custom iterator or null
     */
-    @SuppressWarnings("unchecked")
     public static Iterator getIterator (DataObject obj) {
         Object unknownIterator = obj.getPrimaryFile ().getAttribute(CUSTOM_ITERATOR);
         if (unknownIterator == null) {
@@ -693,7 +692,7 @@
             it = (Iterator)unknownIterator;
         // own brigde for each one iterator type
         } if (unknownIterator instanceof WizardDescriptor.InstantiatingIterator) {
-            it = new InstantiatingIteratorBridge((WizardDescriptor.InstantiatingIterator<WizardDescriptor>) unknownIterator);
+            it = new InstantiatingIteratorBridge((WizardDescriptor.InstantiatingIterator) unknownIterator);
         }
         if (it != null) {
             return it;
@@ -963,8 +962,8 @@
     }
     
     private static class InstantiatingIteratorBridge implements TemplateWizard.Iterator {
-        private WizardDescriptor.InstantiatingIterator<WizardDescriptor> instantiatingIterator;
-        public InstantiatingIteratorBridge (WizardDescriptor.InstantiatingIterator<WizardDescriptor> it) {
+        private WizardDescriptor.InstantiatingIterator<?> instantiatingIterator;
+        public InstantiatingIteratorBridge(WizardDescriptor.InstantiatingIterator<?> it) {
             instantiatingIterator = it;
         }