diff --git a/proposal/mutant/build/ant1compat.xml b/proposal/mutant/build/ant1compat.xml
index 544728e2e..612be9d8e 100644
--- a/proposal/mutant/build/ant1compat.xml
+++ b/proposal/mutant/build/ant1compat.xml
@@ -31,6 +31,7 @@
     <exclude name="org/apache/tools/ant/taskdefs/AntStructure.java"/>
     <exclude name="org/apache/tools/ant/taskdefs/Recorder.java"/>
     <exclude name="org/apache/tools/ant/taskdefs/RecorderEntry.java"/>
+    <exclude name="org/apache/tools/ant/taskdefs/Do.java"/>
     <exclude name="org/apache/tools/ant/taskdefs/optional/jdepend/*.java"/>
   </patternset>
   
diff --git a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java
index 1f4a75627..836702248 100644
--- a/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java
+++ b/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java
@@ -72,6 +72,7 @@ import org.apache.ant.common.service.DataService;
 import org.apache.ant.common.service.EventService;
 import org.apache.ant.common.service.ExecService;
 import org.apache.ant.common.service.FileService;
+import org.apache.ant.common.service.InputService;
 import org.apache.ant.common.service.MagicProperties;
 import org.apache.ant.common.util.DemuxOutputReceiver;
 import org.apache.ant.common.util.ExecutionException;
@@ -898,6 +899,7 @@ public class Frame implements DemuxOutputReceiver {
         services.put(DataService.class, dataService);
         services.put(EventService.class, new CoreEventService(this));
         services.put(ExecService.class, execService);
+        services.put(InputService.class, new CoreInputService(this));
     }
 
 
diff --git a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
index 388b6eda1..d85f32487 100644
--- a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
+++ b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
@@ -176,6 +176,7 @@ public class Builder {
         files.remove(new File(TASKDEFS_ROOT, "Recorder.java"));
         files.remove(new File(TASKDEFS_ROOT, "RecorderEntry.java"));
         files.remove(new File(TASKDEFS_ROOT, "SendEmail.java"));
+        files.remove(new File(TASKDEFS_ROOT, "Do.java"));
         files.remove(new File(INPUT_ROOT, "InputRequest.java"));
         
         // not needed for bootstrap
diff --git a/proposal/mutant/src/java/frontend/org/apache/ant/cli/BuildLogger.java b/proposal/mutant/src/java/frontend/org/apache/ant/cli/BuildLogger.java
index d1624c65d..020f2fed6 100755
--- a/proposal/mutant/src/java/frontend/org/apache/ant/cli/BuildLogger.java
+++ b/proposal/mutant/src/java/frontend/org/apache/ant/cli/BuildLogger.java
@@ -72,21 +72,20 @@ public interface BuildLogger extends BuildListener {
      *
      * @param level the logging level for the logger.
      */
-    public void setMessageOutputLevel(int level);
+    void setMessageOutputLevel(int level);
 
     /**
      * Set the output stream to which this logger is to send its output.
      *
      * @param output the output stream for the logger.
      */
-    public void setOutputPrintStream(PrintStream output);
+    void setOutputPrintStream(PrintStream output);
 
     /**
      * Set the output stream to which this logger is to send error messages.
      *
      * @param err the error stream for the logger.
      */
-    public void setErrorPrintStream(PrintStream err);
-
+    void setErrorPrintStream(PrintStream err);
 }