--- old/test/java/util/Collection/MOAT.java	2013-09-04 14:04:40.844073735 -0700
+++ new/test/java/util/Collection/MOAT.java	2013-09-04 14:04:40.684073728 -0700
@@ -207,8 +207,8 @@
                new Fun(){void f(){ it.next(); }});
 
         try { it.remove(); }
-        catch (IllegalStateException _) { pass(); }
-        catch (UnsupportedOperationException _) { pass(); }
+        catch (IllegalStateException ignored) { pass(); }
+        catch (UnsupportedOperationException ignored) { pass(); }
         catch (Throwable t) { unexpected(t); }
 
         if (rnd.nextBoolean())
@@ -280,9 +280,9 @@
         testEmptyCollection(m.values());
 
         try { check(! m.containsValue(null)); }
-        catch (NullPointerException _) { /* OK */ }
+        catch (NullPointerException ignored) { /* OK */ }
         try { check(! m.containsKey(null)); }
-        catch (NullPointerException _) { /* OK */ }
+        catch (NullPointerException ignored) { /* OK */ }
         check(! m.containsValue(1));
         check(! m.containsKey(1));
     }
@@ -712,8 +712,8 @@
             l.addAll(-1, Collections.<Integer>emptyList());
             fail("Expected IndexOutOfBoundsException not thrown");
         }
-        catch (UnsupportedOperationException _) {/* OK */}
-        catch (IndexOutOfBoundsException _) {/* OK */}
+        catch (UnsupportedOperationException ignored) {/* OK */}
+        catch (IndexOutOfBoundsException ignored) {/* OK */}
         catch (Throwable t) { unexpected(t); }
 
 //      equal(l instanceof Serializable,
@@ -781,7 +781,7 @@
         {
             clear(c);
             try {
-                c.removeAll(null);
+                c.removeAll((Collection) null);
                 fail("Expected NullPointerException");
             }
             catch (NullPointerException e) { pass(); }
@@ -789,7 +789,7 @@
 
             oneElement(c);
             try {
-                c.removeAll(null);
+                c.removeAll((Collection) null);
                 fail("Expected NullPointerException");
             }
             catch (NullPointerException e) { pass(); }