diff --git a/mongodb/benchmark/benchmark.factor b/mongodb/benchmark/benchmark.factor
index 757d7864a3..17ea69f5e3 100644
--- a/mongodb/benchmark/benchmark.factor
+++ b/mongodb/benchmark/benchmark.factor
@@ -19,6 +19,8 @@ TUPLE: result doc collection index batch lasterror ;
 
 : <result> ( -- ) result new result set ; inline
 
+CONSTANT: CHECK-KEY f 
+
 CONSTANT: DOC-SMALL H{ }
 
 CONSTANT: DOC-MEDIUM H{ { "integer" 5 }
@@ -164,7 +166,7 @@ CONSTANT: DOC-LARGE H{ { "base_url" "http://www.example.com/test-me" }
     [ '[ _ _ (insert-batch) ] ] [ '[ _ _ (insert) ] ] if ;
 
 : check-for-key ( assoc key -- )
-    swap key? [ "ups... where's the key" throw ] unless ; inline
+    CHECK-KEY [ swap key? [ "ups... where's the key" throw ] unless ] [ 2drop ] if ; inline
 
 : find-one ( -- quot: ( -- ) )
     collection-name
diff --git a/mongodb/driver/driver.factor b/mongodb/driver/driver.factor
index 118a503213..38199bedaf 100644
--- a/mongodb/driver/driver.factor
+++ b/mongodb/driver/driver.factor
@@ -51,7 +51,7 @@ SYMBOL: mdb-instance
 : slave>> ( mdb -- inet )
     nodes>> [ f ] dip at inet>> ;
 
-: with-db ( mdb quot -- ... )
+: with-db ( mdb quot: ( -- * ) -- * )
     [ [ '[ _ [ mdb-instance set ensure-buffer ] keep master>>
            [ remote-address set ] keep
            binary <client>