diff --git a/src/java/com/samskivert/depot/KeySet.java b/src/java/com/samskivert/depot/KeySet.java
index a9cf662..2d1c726 100644
--- a/src/java/com/samskivert/depot/KeySet.java
+++ b/src/java/com/samskivert/depot/KeySet.java
@@ -144,7 +144,8 @@ public abstract class KeySet<T extends PersistentRecord> extends WhereClause
             if (this == obj) {
                 return true;
             }
-            return (obj instanceof EmptyKeySet) && _pClass.equals(((EmptyKeySet<?>)obj)._pClass);
+            return (obj instanceof EmptyKeySet<?>) &&
+            	_pClass.equals(((EmptyKeySet<?>)obj)._pClass);
         }
 
         @Override public int hashCode () {
@@ -191,7 +192,7 @@ public abstract class KeySet<T extends PersistentRecord> extends WhereClause
             if (this == obj) {
                 return true;
             }
-            if (!(obj instanceof SingleKeySet)) {
+            if (!(obj instanceof SingleKeySet<?>)) {
                 return false;
             }
             SingleKeySet<?> oset = (SingleKeySet<?>)obj;
@@ -245,7 +246,7 @@ public abstract class KeySet<T extends PersistentRecord> extends WhereClause
             if (this == obj) {
                 return true;
             }
-            if (!(obj instanceof MultiKeySet)) {
+            if (!(obj instanceof MultiKeySet<?>)) {
                 return false;
             }
             MultiKeySet<?> oset = (MultiKeySet<?>)obj;
diff --git a/src/java/com/samskivert/depot/impl/DepotMarshaller.java b/src/java/com/samskivert/depot/impl/DepotMarshaller.java
index ccf8863..14e8cd6 100644
--- a/src/java/com/samskivert/depot/impl/DepotMarshaller.java
+++ b/src/java/com/samskivert/depot/impl/DepotMarshaller.java
@@ -918,11 +918,11 @@ public class DepotMarshaller<T extends PersistentRecord>
             }
         } else if (config instanceof SQLExpression) {
             definition.add(new Tuple<SQLExpression, Order>((SQLExpression)config, Order.ASC));
-        } else if (config instanceof Tuple) {
+        } else if (config instanceof Tuple<?,?>) {
             @SuppressWarnings("unchecked") Tuple<SQLExpression, Order> tuple =
                 (Tuple<SQLExpression, Order>)config;
             definition.add(tuple);
-        } else if (config instanceof List) {
+        } else if (config instanceof List<?>) {
             @SuppressWarnings("unchecked") List<Tuple<SQLExpression, Order>> defs =
                 (List<Tuple<SQLExpression, Order>>)config;
             definition.addAll(defs);
diff --git a/src/java/com/samskivert/depot/impl/HSQLBuilder.java b/src/java/com/samskivert/depot/impl/HSQLBuilder.java
index cb4ec0f..4a819a4 100644
--- a/src/java/com/samskivert/depot/impl/HSQLBuilder.java
+++ b/src/java/com/samskivert/depot/impl/HSQLBuilder.java
@@ -291,7 +291,7 @@ public class HSQLBuilder
             return "VARBINARY";
         } else if (fm instanceof FieldMarshaller.IntArrayMarshaller) {
             return "VARBINARY";
-        } else if (fm instanceof FieldMarshaller.ByteEnumMarshaller) {
+        } else if (fm instanceof FieldMarshaller.ByteEnumMarshaller<?>) {
             return "TINYINT";
         } else if (fm instanceof FieldMarshaller.BooleanMarshaller) {
             return "BOOLEAN";
diff --git a/src/java/com/samskivert/depot/impl/MySQLBuilder.java b/src/java/com/samskivert/depot/impl/MySQLBuilder.java
index 8af6524..6f6e2f3 100644
--- a/src/java/com/samskivert/depot/impl/MySQLBuilder.java
+++ b/src/java/com/samskivert/depot/impl/MySQLBuilder.java
@@ -330,7 +330,7 @@ public class MySQLBuilder
                 return "MEDIUMBLOB";
             }
             return "LONGBLOB";
-        } else if (fm instanceof ByteEnumMarshaller) {
+        } else if (fm instanceof ByteEnumMarshaller<?>) {
             return "TINYINT";
         } else if (fm instanceof BooleanMarshaller) {
             return "TINYINT";
diff --git a/src/java/com/samskivert/depot/impl/PostgreSQLBuilder.java b/src/java/com/samskivert/depot/impl/PostgreSQLBuilder.java
index b74a4f9..a548acf 100644
--- a/src/java/com/samskivert/depot/impl/PostgreSQLBuilder.java
+++ b/src/java/com/samskivert/depot/impl/PostgreSQLBuilder.java
@@ -294,7 +294,7 @@ public class PostgreSQLBuilder
             return "BYTEA";
         } else if (fm instanceof FieldMarshaller.IntArrayMarshaller) {
             return "BYTEA";
-        } else if (fm instanceof FieldMarshaller.ByteEnumMarshaller) {
+        } else if (fm instanceof FieldMarshaller.ByteEnumMarshaller<?>) {
             return "SMALLINT";
         } else if (fm instanceof FieldMarshaller.BooleanMarshaller) {
             return "BOOLEAN";