diff --git a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
index c85d16bb4..a6c15da25 100644
--- a/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
@@ -260,8 +260,11 @@ public class MimeMailer extends Mailer {
     }
 
     private String parseCharSetFromMimeType(String type) {
-        int pos;
-        if (type == null || (pos = type.indexOf("charset")) < 0) {
+        if (type == null) {
+            return null;
+        }
+        int pos = type.indexOf("charset");
+        if (pos < 0) {
           return null;
         }
         // Assuming mime type in form "text/XXXX; charset=XXXXXX"
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
index cccb403ef..d4b65880b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
@@ -153,7 +153,7 @@ public class WLJspc extends MatchingTask {
         args[j++] = destinationDirectory.getAbsolutePath().trim();
         args[j++] = "-docroot";
         args[j++] = sourceDirectory.getAbsolutePath().trim();
-        args[j++] = "-keepgenerated";  //TODO: Parameterise ??
+        args[j++] = "-keepgenerated";
         //Call compiler as class... dont want to fork again
         //Use classic compiler -- can be parameterised?
         args[j++] =  "-compilerclass";