diff --git a/java/external/src/javax/xml/parsers/FactoryFinder.java b/java/external/src/javax/xml/parsers/FactoryFinder.java
index cce4410..423c204 100644
--- a/java/external/src/javax/xml/parsers/FactoryFinder.java
+++ b/java/external/src/javax/xml/parsers/FactoryFinder.java
@@ -102,7 +102,6 @@ class FactoryFinder {
     private static ClassLoader findClassLoader()
         throws ConfigurationError
     {
-        ClassLoader classLoader;
         Method m = null;
 
         try {
@@ -112,11 +111,11 @@ class FactoryFinder {
             if (debug) {
                 debugPrintln("assuming JDK 1.1");
             }
-            classLoader = FactoryFinder.class.getClassLoader();
+            return FactoryFinder.class.getClassLoader();
         }
 
         try {
-            classLoader = (ClassLoader) m.invoke(Thread.currentThread(), null);
+            return (ClassLoader) m.invoke(Thread.currentThread(), null);
         } catch (IllegalAccessException e) {
             // assert(false)
             throw new ConfigurationError("Unexpected IllegalAccessException",
@@ -126,8 +125,6 @@ class FactoryFinder {
             throw new ConfigurationError("Unexpected InvocationTargetException",
                                          e);
         }
-
-        return classLoader;
     }
 
     /**
diff --git a/java/external/src/javax/xml/transform/FactoryFinder.java b/java/external/src/javax/xml/transform/FactoryFinder.java
index 98e3847..0b579e1 100644
--- a/java/external/src/javax/xml/transform/FactoryFinder.java
+++ b/java/external/src/javax/xml/transform/FactoryFinder.java
@@ -102,7 +102,6 @@ class FactoryFinder {
     private static ClassLoader findClassLoader()
         throws ConfigurationError
     {
-        ClassLoader classLoader;
         Method m = null;
 
         try {
@@ -112,11 +111,11 @@ class FactoryFinder {
             if (debug) {
                 debugPrintln("assuming JDK 1.1");
             }
-            classLoader = FactoryFinder.class.getClassLoader();
+            return FactoryFinder.class.getClassLoader();
         }
 
         try {
-            classLoader = (ClassLoader) m.invoke(Thread.currentThread(), null);
+            return (ClassLoader) m.invoke(Thread.currentThread(), null);
         } catch (IllegalAccessException e) {
             // assert(false)
             throw new ConfigurationError("Unexpected IllegalAccessException",
@@ -126,8 +125,6 @@ class FactoryFinder {
             throw new ConfigurationError("Unexpected InvocationTargetException",
                                          e);
         }
-
-        return classLoader;
     }
 
     /**