Nixed a bit more unneeded parameterized typing.

src/java/com/samskivert/depot/Key.java

@@ -47,13 +47,13 @@ public class Key<T extends PersistentRecord> extends WhereClause
 {
     /** Handles the matching of the key columns to its bound values. This is needed so that we can
      * combine a bunch of keys into a {@link KeySet}. */
-    public static class Expression<U extends PersistentRecord> implements SQLExpression
+    public static class Expression implements SQLExpression
     {
-        public Expression (Class<U> pClass, Comparable<?>[] values) {
+        public Expression (Class<? extends PersistentRecord> pClass, Comparable<?>[] values) {
             _pClass = pClass;
             _values = values;
         }
-        public Class<U> getPersistentClass () {
+        public Class<? extends PersistentRecord> getPersistentClass () {
             return _pClass;
         }
         public Comparable<?>[] getValues () {
@@ -65,7 +65,7 @@ public class Key<T extends PersistentRecord> extends WhereClause
         public void addClasses (Collection<Class<? extends PersistentRecord>> classSet) {
             classSet.add(getPersistentClass());
         }
-        protected Class<U> _pClass;
+        protected Class<? extends PersistentRecord> _pClass;
         protected Comparable<?>[] _values;
     }
 
@@ -167,11 +167,10 @@ public class Key<T extends PersistentRecord> extends WhereClause
         return _values;
     }
 
-    // from WhereClause
-    @Override
+    @Override // from WhereClause
     public SQLExpression getWhereExpression ()
     {
-        return new Expression<T>(_pClass, _values);
+        return new Expression(_pClass, _values);
     }
 
     // from SQLExpression
@@ -204,7 +203,8 @@ public class Key<T extends PersistentRecord> extends WhereClause
         if (!pClass.equals(_pClass)) {
             throw new IllegalArgumentException(
                 "Class mismatch between persistent record and cache invalidator " +
-                "[record=" + pClass.getSimpleName() + ", invtype=" + _pClass.getSimpleName() + "].");
+                "[record=" + pClass.getSimpleName() +
+                ", invtype=" + _pClass.getSimpleName() + "].");
         }
     }
 

src/java/com/samskivert/depot/KeySet.java

@@ -224,7 +224,7 @@ public abstract class KeySet<T extends PersistentRecord> extends WhereClause
             SQLExpression[] keyexps = new SQLExpression[_keys.length];
             int ii = 0;
             for (Comparable<?>[] kvals : _keys) {
-                keyexps[ii++] = new Key.Expression<T>(_pClass, kvals);
+                keyexps[ii++] = new Key.Expression(_pClass, kvals);
             }
             return new Or(keyexps);
         }

src/java/com/samskivert/depot/impl/BuildVisitor.java

@@ -117,7 +117,7 @@ public abstract class BuildVisitor implements ExpressionVisitor<Void>
         return null;
     }
 
-    public Void visit (Key.Expression<? extends PersistentRecord> key)
+    public Void visit (Key.Expression key)
     {
         Class<? extends PersistentRecord> pClass = key.getPersistentClass();
         String[] keyFields = DepotUtil.getKeyFields(pClass);
@@ -327,7 +327,7 @@ public abstract class BuildVisitor implements ExpressionVisitor<Void>
         return null;
     }
 
-    public Void visit (Exists<? extends PersistentRecord> exists)
+    public Void visit (Exists exists)
     {
         _builder.append("exists ");
         exists.getSubClause().accept(this);
@@ -555,7 +555,7 @@ public abstract class BuildVisitor implements ExpressionVisitor<Void>
         return null;
     }
 
-    public Void visit (DropIndexClause<? extends PersistentRecord> dropIndexClause)
+    public Void visit (DropIndexClause dropIndexClause)
     {
         _builder.append("drop index ");
         appendIdentifier(dropIndexClause.getName());

src/java/com/samskivert/depot/impl/ExpressionEvaluator.java

@@ -229,7 +229,7 @@ public class ExpressionEvaluator
         return new NoValue("Non-boolean result from Where expression: " + result);
     }
 
-    public Object visit (Key.Expression<? extends PersistentRecord> key)
+    public Object visit (Key.Expression key)
     {
         Class<? extends PersistentRecord> pClass = key.getPersistentClass();
         if (pClass != _pClass) {
@@ -259,7 +259,7 @@ public class ExpressionEvaluator
         return true;
     }
 
-    public Object visit (Exists<? extends PersistentRecord> exists)
+    public Object visit (Exists exists)
     {
         throw new IllegalArgumentException("Can't evaluate expression: " + exists);
     }
@@ -324,7 +324,7 @@ public class ExpressionEvaluator
         throw new IllegalArgumentException("Can't evaluate expression: " + createIndexClause);
     }
 
-    public Object visit (DropIndexClause<? extends PersistentRecord> dropIndexClause)
+    public Object visit (DropIndexClause dropIndexClause)
     {
         throw new IllegalArgumentException("Can't evaluate expression: " + dropIndexClause);
     }

src/java/com/samskivert/depot/impl/ExpressionVisitor.java

@@ -81,13 +81,13 @@ public interface ExpressionVisitor<T>
     public T visit (ValueExp value);
     public T visit (IntervalExp interval);
     public T visit (WhereClause where);
-    public T visit (Key.Expression<? extends PersistentRecord> key);
-    public T visit (Exists<? extends PersistentRecord> exists);
+    public T visit (Key.Expression key);
+    public T visit (Exists exists);
     public T visit (SelectClause selectClause);
     public T visit (UpdateClause updateClause);
     public T visit (DeleteClause deleteClause);
     public T visit (InsertClause insertClause);
     public T visit (CreateIndexClause createIndexClause);
-    public T visit (DropIndexClause<? extends PersistentRecord> dropIndexClause);
+    public T visit (DropIndexClause dropIndexClause);
     public T visit (Case caseExp);
 }

src/java/com/samskivert/depot/impl/MySQLBuilder.java

@@ -116,7 +116,7 @@ public class MySQLBuilder
         }
 
         @Override
-        public Void visit (DropIndexClause<? extends PersistentRecord> dropIndexClause)
+        public Void visit (DropIndexClause dropIndexClause)
         {
             // MySQL's indexes are scoped on the table, not on the database, and the
             // SQL syntax reflects it: DROP INDEX fooIx on fooTable

src/java/com/samskivert/depot/impl/clause/DropIndexClause.java

@@ -30,7 +30,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  * Represents an DROP INDEX instruction to the database.
  */
-public class DropIndexClause<T extends PersistentRecord>
+public class DropIndexClause
     implements QueryClause
 {
     public DropIndexClause (Class<? extends PersistentRecord> pClass, String name)

src/java/com/samskivert/depot/operator/Exists.java

@@ -29,7 +29,7 @@ import com.samskivert.depot.impl.ExpressionVisitor;
 /**
  * The SQL 'exists' operator.
  */
-public class Exists<T extends PersistentRecord>
+public class Exists
     implements SQLOperator
 {
     public Exists (SelectClause clause)