diff --git a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
index 2271501..5671b2b 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
+++ b/src/java/com/samskivert/jdbc/depot/DepotMarshaller.java
@@ -72,7 +72,7 @@ public class DepotMarshaller<T>
         _fields = flist.toArray(new FieldMarshaller[flist.size()]);
 
         // generate our full list of columns for use in queries
-        StringBuffer columns = new StringBuffer();
+        StringBuilder columns = new StringBuilder();
         for (FieldMarshaller fm : _fields) {
             if (columns.length() > 0) {
                 columns.append(",");
diff --git a/src/java/com/samskivert/jdbc/depot/DepotRepository.java b/src/java/com/samskivert/jdbc/depot/DepotRepository.java
index 3fafd03..f96a48b 100644
--- a/src/java/com/samskivert/jdbc/depot/DepotRepository.java
+++ b/src/java/com/samskivert/jdbc/depot/DepotRepository.java
@@ -192,7 +192,7 @@ public class DepotRepository
 
         public String toWhereClause ()
         {
-            StringBuffer where = new StringBuffer();
+            StringBuilder where = new StringBuilder();
             for (int ii = 0; ii < indices.length; ii++) {
                 if (ii > 0) {
                     where.append(" and ");