diff --git a/src/main/java/com/samskivert/depot/DepotRepository.java b/src/main/java/com/samskivert/depot/DepotRepository.java
index 3be1556..c78bcbc 100644
--- a/src/main/java/com/samskivert/depot/DepotRepository.java
+++ b/src/main/java/com/samskivert/depot/DepotRepository.java
@@ -20,10 +20,12 @@ import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
+import static com.google.common.base.Preconditions.checkArgument;
 
+import com.samskivert.jdbc.ConnectionProvider;
+import com.samskivert.jdbc.DatabaseLiaison;
 import com.samskivert.util.ArrayUtil;
 
-import com.samskivert.depot.clause.FieldOverride;
 import com.samskivert.depot.clause.InsertClause;
 import com.samskivert.depot.clause.Limit;
 import com.samskivert.depot.clause.QueryClause;
@@ -31,8 +33,7 @@ import com.samskivert.depot.clause.WhereClause;
 import com.samskivert.depot.expression.ColumnExp;
 import com.samskivert.depot.expression.SQLExpression;
 import com.samskivert.depot.util.Sequence;
-import com.samskivert.jdbc.ConnectionProvider;
-import com.samskivert.jdbc.DatabaseLiaison;
+import static com.samskivert.depot.Log.log;
 
 import com.samskivert.depot.impl.DepotMarshaller;
 import com.samskivert.depot.impl.DepotMigrationHistoryRecord;
@@ -48,9 +49,6 @@ import com.samskivert.depot.impl.clause.UpdateClause;
 import com.samskivert.depot.impl.expression.ValueExp;
 import com.samskivert.depot.impl.util.SeqImpl;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.samskivert.depot.Log.log;
-
 /**
  * Provides a base for classes that provide access to persistent objects. Also defines the
  * mechanism by which all persistent queries and updates are routed through the distributed cache.
diff --git a/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java b/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java
index bb6c428..3c1e7c2 100644
--- a/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java
+++ b/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java
@@ -4,9 +4,6 @@
 
 package com.samskivert.depot.impl;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.samskivert.depot.Log.log;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.sql.Connection;
@@ -26,6 +23,12 @@ import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import static com.google.common.base.Preconditions.checkArgument;
+
+import com.samskivert.jdbc.ColumnDefinition;
+import com.samskivert.jdbc.DatabaseLiaison;
+import com.samskivert.util.StringUtil;
+import com.samskivert.util.Tuple;
 
 import com.samskivert.depot.DatabaseException;
 import com.samskivert.depot.Key;
@@ -47,12 +50,7 @@ import com.samskivert.depot.clause.QueryClause;
 import com.samskivert.depot.expression.ColumnExp;
 import com.samskivert.depot.expression.SQLExpression;
 import com.samskivert.depot.impl.clause.CreateIndexClause;
-import com.samskivert.util.ArrayUtil;
-import com.samskivert.util.StringUtil;
-import com.samskivert.util.Tuple;
-
-import com.samskivert.jdbc.ColumnDefinition;
-import com.samskivert.jdbc.DatabaseLiaison;
+import static com.samskivert.depot.Log.log;
 
 /**
  * Handles the marshalling and unmarshalling of persistent instances to JDBC primitives ({@link
diff --git a/src/main/java/com/samskivert/depot/impl/HSQLBuilder.java b/src/main/java/com/samskivert/depot/impl/HSQLBuilder.java
index 3aba0d1..126118f 100644
--- a/src/main/java/com/samskivert/depot/impl/HSQLBuilder.java
+++ b/src/main/java/com/samskivert/depot/impl/HSQLBuilder.java
@@ -197,10 +197,9 @@ public class HSQLBuilder
         @Override protected boolean orderSupported (OrderBy.Order order)
         {
             switch (order) {
-            case ASC: case DESC:
-                return true;
+            case ASC: case DESC: return true;
+            default: return false;
             }
-            return false;
         }
     }
 
diff --git a/src/main/java/com/samskivert/depot/impl/MySQLBuilder.java b/src/main/java/com/samskivert/depot/impl/MySQLBuilder.java
index 19079ef..7653503 100644
--- a/src/main/java/com/samskivert/depot/impl/MySQLBuilder.java
+++ b/src/main/java/com/samskivert/depot/impl/MySQLBuilder.java
@@ -26,7 +26,7 @@ import com.samskivert.depot.impl.expression.DateFun.DateTruncate;
 import com.samskivert.depot.impl.expression.DateFun.DatePart.Part;
 import com.samskivert.depot.impl.expression.NumericalFun.Trunc;
 
-import static com.samskivert.Log.log;
+import static com.samskivert.depot.Log.log;
 
 public class MySQLBuilder
     extends SQLBuilder
@@ -176,10 +176,9 @@ public class MySQLBuilder
         @Override protected boolean orderSupported (OrderBy.Order order)
         {
             switch (order) {
-            case NULL: case ASC: case DESC:
-                return true;
+            case NULL: case ASC: case DESC: return true;
+            default: return false;
             }
-            return false;
         }
     }