diff --git a/src/main/java/com/samskivert/depot/impl/BuildVisitor.java b/src/main/java/com/samskivert/depot/impl/BuildVisitor.java
index 4f1dcd8..9bca927 100644
--- a/src/main/java/com/samskivert/depot/impl/BuildVisitor.java
+++ b/src/main/java/com/samskivert/depot/impl/BuildVisitor.java
@@ -13,6 +13,8 @@ import java.util.Set;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.samskivert.depot.clause.Distinct;
 import com.samskivert.util.ByteEnum;
@@ -37,6 +39,7 @@ import com.samskivert.depot.clause.WhereClause;
 import com.samskivert.depot.expression.*;
 import com.samskivert.depot.operator.Case;
 import com.samskivert.depot.operator.FullText;
+import static com.samskivert.depot.Log.log;
 
 import com.samskivert.depot.impl.clause.CreateIndexClause;
 import com.samskivert.depot.impl.clause.DeleteClause;
@@ -84,10 +87,6 @@ import com.samskivert.depot.impl.operator.IsNull;
 import com.samskivert.depot.impl.operator.MultiOperator;
 import com.samskivert.depot.impl.operator.Not;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.samskivert.Log.log;
-
 /**
  * Implements the base functionality of the SQL-building pass of {@link SQLBuilder}. Dialectal
  * subclasses of this should be created and returned from {@link SQLBuilder#getBuildVisitor()}.
diff --git a/src/main/java/com/samskivert/depot/impl/PostgreSQLBuilder.java b/src/main/java/com/samskivert/depot/impl/PostgreSQLBuilder.java
index 4edd388..b54820b 100644
--- a/src/main/java/com/samskivert/depot/impl/PostgreSQLBuilder.java
+++ b/src/main/java/com/samskivert/depot/impl/PostgreSQLBuilder.java
@@ -22,13 +22,13 @@ import com.samskivert.depot.PersistentRecord;
 import com.samskivert.depot.annotation.FullTextIndex.Configuration;
 import com.samskivert.depot.annotation.FullTextIndex;
 import com.samskivert.depot.clause.OrderBy;
-import com.samskivert.depot.impl.expression.IntervalExp;
+import com.samskivert.depot.operator.FullText;
+import static com.samskivert.depot.Log.log;
+
+import com.samskivert.depot.impl.expression.DateFun.DatePart.Part;
 import com.samskivert.depot.impl.expression.DateFun.DatePart;
 import com.samskivert.depot.impl.expression.DateFun.DateTruncate;
-import com.samskivert.depot.impl.expression.DateFun.DatePart.Part;
-import com.samskivert.depot.operator.FullText;
-
-import static com.samskivert.Log.log;
+import com.samskivert.depot.impl.expression.IntervalExp;
 
 public class PostgreSQLBuilder
     extends SQLBuilder