Index: library/mongodb/mongoAPI.h
===================================================================
diff -u -r17ba2f1d86be4afd497d652b7ee39a5edc771a22 -rcef0608bea97458e5dcd87615c9b8ca3fe7b464c
--- library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision 17ba2f1d86be4afd497d652b7ee39a5edc771a22)
+++ library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision cef0608bea97458e5dcd87615c9b8ca3fe7b464c)
@@ -25,24 +25,24 @@
 static int NsfMongoRemoveStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 static int NsfMongoUpdateStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
 
-static int NsfMongoClose(Tcl_Interp *interp, mongo_connection *mongo_connectionPtr);
+static int NsfMongoClose(Tcl_Interp *interp, mongo_connection *connPtr, Tcl_Obj *connObj);
 static int NsfMongoConnect(Tcl_Interp *interp, CONST char *withReplica_set, Tcl_Obj *withServer);
-static int NsfMongoCount(Tcl_Interp *interp, mongo_connection *mongo_connectionPtr, CONST char *namespace, Tcl_Obj *query);
-static int NsfMongoGridFSClose(Tcl_Interp *interp, gridfs *gridfsPtr);
-static int NsfMongoGridFSOpen(Tcl_Interp *interp, mongo_connection *mongo_connectionPtr, CONST char *dbname, CONST char *prefix);
-static int NsfMongoGridFSRemoveFile(Tcl_Interp *interp, gridfs *gridfsPtr, CONST char *filename);
-static int NsfMongoGridFSStoreFile(Tcl_Interp *interp, gridfs *gridfsPtr, CONST char *filename, CONST char *remotename, CONST char *contenttype);
-static int NsfMongoGridFileClose(Tcl_Interp *interp, gridfile *gridfilePtr);
-static int NsfMongoGridFileGetContentType(Tcl_Interp *interp, gridfile *gridfilePtr);
-static int NsfMongoGridFileGetContentlength(Tcl_Interp *interp, gridfile *gridfilePtr);
-static int NsfMongoGridFileGetMetaData(Tcl_Interp *interp, gridfile *gridfilePtr);
-static int NsfMongoGridFileOpen(Tcl_Interp *interp, gridfs *gridfsPtr, CONST char *filename);
-static int NsfMongoGridFileRead(Tcl_Interp *interp, gridfile *gridfilePtr, int size);
-static int NsfMongoIndex(Tcl_Interp *interp, mongo_connection *mongo_connectionPtr, CONST char *namespace, Tcl_Obj *attributes, int withDropdups, int withUnique);
-static int NsfMongoInsert(Tcl_Interp *interp, mongo_connection *mongo_connectionPtr, CONST char *namespace, Tcl_Obj *values);
-static int NsfMongoQuery(Tcl_Interp *interp, mongo_connection *mongo_connectionPtr, CONST char *namespace, Tcl_Obj *query, Tcl_Obj *withAtts, int withLimit, int withSkip);
-static int NsfMongoRemove(Tcl_Interp *interp, mongo_connection *mongo_connectionPtr, CONST char *namespace, Tcl_Obj *condition);
-static int NsfMongoUpdate(Tcl_Interp *interp, mongo_connection *mongo_connectionPtr, CONST char *namespace, Tcl_Obj *cond, Tcl_Obj *values, int withUpsert, int withAll);
+static int NsfMongoCount(Tcl_Interp *interp, mongo_connection *connPtr, CONST char *namespace, Tcl_Obj *query);
+static int NsfMongoGridFSClose(Tcl_Interp *interp, gridfs *gfsPtr, Tcl_Obj *gfsObj);
+static int NsfMongoGridFSOpen(Tcl_Interp *interp, mongo_connection *connPtr, CONST char *dbname, CONST char *prefix);
+static int NsfMongoGridFSRemoveFile(Tcl_Interp *interp, gridfs *gfsPtr, CONST char *filename);
+static int NsfMongoGridFSStoreFile(Tcl_Interp *interp, gridfs *gfsPtr, CONST char *filename, CONST char *remotename, CONST char *contenttype);
+static int NsfMongoGridFileClose(Tcl_Interp *interp, gridfile *filePtr, Tcl_Obj *fileObj);
+static int NsfMongoGridFileGetContentType(Tcl_Interp *interp, gridfile *filePtr);
+static int NsfMongoGridFileGetContentlength(Tcl_Interp *interp, gridfile *filePtr);
+static int NsfMongoGridFileGetMetaData(Tcl_Interp *interp, gridfile *filePtr);
+static int NsfMongoGridFileOpen(Tcl_Interp *interp, gridfs *fsPtr, CONST char *filename);
+static int NsfMongoGridFileRead(Tcl_Interp *interp, gridfile *filePtr, int size);
+static int NsfMongoIndex(Tcl_Interp *interp, mongo_connection *connPtr, CONST char *namespace, Tcl_Obj *attributes, int withDropdups, int withUnique);
+static int NsfMongoInsert(Tcl_Interp *interp, mongo_connection *connPtr, CONST char *namespace, Tcl_Obj *values);
+static int NsfMongoQuery(Tcl_Interp *interp, mongo_connection *connPtr, CONST char *namespace, Tcl_Obj *query, Tcl_Obj *withAtts, int withLimit, int withSkip);
+static int NsfMongoRemove(Tcl_Interp *interp, mongo_connection *connPtr, CONST char *namespace, Tcl_Obj *condition);
+static int NsfMongoUpdate(Tcl_Interp *interp, mongo_connection *connPtr, CONST char *namespace, Tcl_Obj *cond, Tcl_Obj *values, int withUpsert, int withAll);
 
 enum {
  NsfMongoCloseIdx,
@@ -77,10 +77,10 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    mongo_connection *mongo_connectionPtr = (mongo_connection *)pc.clientData[0];
+    mongo_connection *connPtr = (mongo_connection *)pc.clientData[0];
 
     assert(pc.status == 0);
-    return NsfMongoClose(interp, mongo_connectionPtr);
+    return NsfMongoClose(interp, connPtr,pc.objv[0]);
 
   }
 }
@@ -116,12 +116,12 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    mongo_connection *mongo_connectionPtr = (mongo_connection *)pc.clientData[0];
+    mongo_connection *connPtr = (mongo_connection *)pc.clientData[0];
     CONST char *namespace = (CONST char *)pc.clientData[1];
     Tcl_Obj *query = (Tcl_Obj *)pc.clientData[2];
 
     assert(pc.status == 0);
-    return NsfMongoCount(interp, mongo_connectionPtr, namespace, query);
+    return NsfMongoCount(interp, connPtr, namespace, query);
 
   }
 }
@@ -137,10 +137,10 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    gridfs *gridfsPtr = (gridfs *)pc.clientData[0];
+    gridfs *gfsPtr = (gridfs *)pc.clientData[0];
 
     assert(pc.status == 0);
-    return NsfMongoGridFSClose(interp, gridfsPtr);
+    return NsfMongoGridFSClose(interp, gfsPtr,pc.objv[0]);
 
   }
 }
@@ -156,12 +156,12 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    mongo_connection *mongo_connectionPtr = (mongo_connection *)pc.clientData[0];
+    mongo_connection *connPtr = (mongo_connection *)pc.clientData[0];
     CONST char *dbname = (CONST char *)pc.clientData[1];
     CONST char *prefix = (CONST char *)pc.clientData[2];
 
     assert(pc.status == 0);
-    return NsfMongoGridFSOpen(interp, mongo_connectionPtr, dbname, prefix);
+    return NsfMongoGridFSOpen(interp, connPtr, dbname, prefix);
 
   }
 }
@@ -177,11 +177,11 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    gridfs *gridfsPtr = (gridfs *)pc.clientData[0];
+    gridfs *gfsPtr = (gridfs *)pc.clientData[0];
     CONST char *filename = (CONST char *)pc.clientData[1];
 
     assert(pc.status == 0);
-    return NsfMongoGridFSRemoveFile(interp, gridfsPtr, filename);
+    return NsfMongoGridFSRemoveFile(interp, gfsPtr, filename);
 
   }
 }
@@ -197,13 +197,13 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    gridfs *gridfsPtr = (gridfs *)pc.clientData[0];
+    gridfs *gfsPtr = (gridfs *)pc.clientData[0];
     CONST char *filename = (CONST char *)pc.clientData[1];
     CONST char *remotename = (CONST char *)pc.clientData[2];
     CONST char *contenttype = (CONST char *)pc.clientData[3];
 
     assert(pc.status == 0);
-    return NsfMongoGridFSStoreFile(interp, gridfsPtr, filename, remotename, contenttype);
+    return NsfMongoGridFSStoreFile(interp, gfsPtr, filename, remotename, contenttype);
 
   }
 }
@@ -219,10 +219,10 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    gridfile *gridfilePtr = (gridfile *)pc.clientData[0];
+    gridfile *filePtr = (gridfile *)pc.clientData[0];
 
     assert(pc.status == 0);
-    return NsfMongoGridFileClose(interp, gridfilePtr);
+    return NsfMongoGridFileClose(interp, filePtr,pc.objv[0]);
 
   }
 }
@@ -238,10 +238,10 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    gridfile *gridfilePtr = (gridfile *)pc.clientData[0];
+    gridfile *filePtr = (gridfile *)pc.clientData[0];
 
     assert(pc.status == 0);
-    return NsfMongoGridFileGetContentType(interp, gridfilePtr);
+    return NsfMongoGridFileGetContentType(interp, filePtr);
 
   }
 }
@@ -257,10 +257,10 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    gridfile *gridfilePtr = (gridfile *)pc.clientData[0];
+    gridfile *filePtr = (gridfile *)pc.clientData[0];
 
     assert(pc.status == 0);
-    return NsfMongoGridFileGetContentlength(interp, gridfilePtr);
+    return NsfMongoGridFileGetContentlength(interp, filePtr);
 
   }
 }
@@ -276,10 +276,10 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    gridfile *gridfilePtr = (gridfile *)pc.clientData[0];
+    gridfile *filePtr = (gridfile *)pc.clientData[0];
 
     assert(pc.status == 0);
-    return NsfMongoGridFileGetMetaData(interp, gridfilePtr);
+    return NsfMongoGridFileGetMetaData(interp, filePtr);
 
   }
 }
@@ -295,11 +295,11 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    gridfs *gridfsPtr = (gridfs *)pc.clientData[0];
+    gridfs *fsPtr = (gridfs *)pc.clientData[0];
     CONST char *filename = (CONST char *)pc.clientData[1];
 
     assert(pc.status == 0);
-    return NsfMongoGridFileOpen(interp, gridfsPtr, filename);
+    return NsfMongoGridFileOpen(interp, fsPtr, filename);
 
   }
 }
@@ -315,11 +315,11 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    gridfile *gridfilePtr = (gridfile *)pc.clientData[0];
+    gridfile *filePtr = (gridfile *)pc.clientData[0];
     int size = (int )PTR2INT(pc.clientData[1]);
 
     assert(pc.status == 0);
-    return NsfMongoGridFileRead(interp, gridfilePtr, size);
+    return NsfMongoGridFileRead(interp, filePtr, size);
 
   }
 }
@@ -335,14 +335,14 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    mongo_connection *mongo_connectionPtr = (mongo_connection *)pc.clientData[0];
+    mongo_connection *connPtr = (mongo_connection *)pc.clientData[0];
     CONST char *namespace = (CONST char *)pc.clientData[1];
     Tcl_Obj *attributes = (Tcl_Obj *)pc.clientData[2];
     int withDropdups = (int )PTR2INT(pc.clientData[3]);
     int withUnique = (int )PTR2INT(pc.clientData[4]);
 
     assert(pc.status == 0);
-    return NsfMongoIndex(interp, mongo_connectionPtr, namespace, attributes, withDropdups, withUnique);
+    return NsfMongoIndex(interp, connPtr, namespace, attributes, withDropdups, withUnique);
 
   }
 }
@@ -358,12 +358,12 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    mongo_connection *mongo_connectionPtr = (mongo_connection *)pc.clientData[0];
+    mongo_connection *connPtr = (mongo_connection *)pc.clientData[0];
     CONST char *namespace = (CONST char *)pc.clientData[1];
     Tcl_Obj *values = (Tcl_Obj *)pc.clientData[2];
 
     assert(pc.status == 0);
-    return NsfMongoInsert(interp, mongo_connectionPtr, namespace, values);
+    return NsfMongoInsert(interp, connPtr, namespace, values);
 
   }
 }
@@ -379,15 +379,15 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    mongo_connection *mongo_connectionPtr = (mongo_connection *)pc.clientData[0];
+    mongo_connection *connPtr = (mongo_connection *)pc.clientData[0];
     CONST char *namespace = (CONST char *)pc.clientData[1];
     Tcl_Obj *query = (Tcl_Obj *)pc.clientData[2];
     Tcl_Obj *withAtts = (Tcl_Obj *)pc.clientData[3];
     int withLimit = (int )PTR2INT(pc.clientData[4]);
     int withSkip = (int )PTR2INT(pc.clientData[5]);
 
     assert(pc.status == 0);
-    return NsfMongoQuery(interp, mongo_connectionPtr, namespace, query, withAtts, withLimit, withSkip);
+    return NsfMongoQuery(interp, connPtr, namespace, query, withAtts, withLimit, withSkip);
 
   }
 }
@@ -403,12 +403,12 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    mongo_connection *mongo_connectionPtr = (mongo_connection *)pc.clientData[0];
+    mongo_connection *connPtr = (mongo_connection *)pc.clientData[0];
     CONST char *namespace = (CONST char *)pc.clientData[1];
     Tcl_Obj *condition = (Tcl_Obj *)pc.clientData[2];
 
     assert(pc.status == 0);
-    return NsfMongoRemove(interp, mongo_connectionPtr, namespace, condition);
+    return NsfMongoRemove(interp, connPtr, namespace, condition);
 
   }
 }
@@ -424,15 +424,15 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    mongo_connection *mongo_connectionPtr = (mongo_connection *)pc.clientData[0];
+    mongo_connection *connPtr = (mongo_connection *)pc.clientData[0];
     CONST char *namespace = (CONST char *)pc.clientData[1];
     Tcl_Obj *cond = (Tcl_Obj *)pc.clientData[2];
     Tcl_Obj *values = (Tcl_Obj *)pc.clientData[3];
     int withUpsert = (int )PTR2INT(pc.clientData[4]);
     int withAll = (int )PTR2INT(pc.clientData[5]);
 
     assert(pc.status == 0);
-    return NsfMongoUpdate(interp, mongo_connectionPtr, namespace, cond, values, withUpsert, withAll);
+    return NsfMongoUpdate(interp, connPtr, namespace, cond, values, withUpsert, withAll);
 
   }
 }
@@ -442,31 +442,31 @@
   {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"mongo_connection",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::connect", NsfMongoConnectStub, 2, {
-  {"-replica-set", 0, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"-server", 0, 1, Nsf_ConvertToTclobj, NULL,NULL,"tclobj",NULL,NULL,NULL,NULL,NULL}}
+  {"-replica-set", 0, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-server", 0, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::count", NsfMongoCountStub, 3, {
   {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"mongo_connection",NULL,NULL,NULL,NULL,NULL},
-  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"query", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,"tclobj",NULL,NULL,NULL,NULL,NULL}}
+  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"query", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::gridfs::close", NsfMongoGridFSCloseStub, 1, {
   {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"gridfs",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::gridfs::open", NsfMongoGridFSOpenStub, 3, {
   {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"mongo_connection",NULL,NULL,NULL,NULL,NULL},
-  {"dbname", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"prefix", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL}}
+  {"dbname", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"prefix", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::gridfs::remove_file", NsfMongoGridFSRemoveFileStub, 2, {
   {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"gridfs",NULL,NULL,NULL,NULL,NULL},
-  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL}}
+  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::gridfs::store_file", NsfMongoGridFSStoreFileStub, 4, {
   {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"gridfs",NULL,NULL,NULL,NULL,NULL},
-  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"remotename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"contenttype", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL}}
+  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"remotename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"contenttype", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::gridfile::close", NsfMongoGridFileCloseStub, 1, {
   {"file", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"gridfile",NULL,NULL,NULL,NULL,NULL}}
@@ -482,44 +482,44 @@
 },
 {"::mongo::gridfile::open", NsfMongoGridFileOpenStub, 2, {
   {"fs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"gridfs",NULL,NULL,NULL,NULL,NULL},
-  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL}}
+  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::gridfile::read", NsfMongoGridFileReadStub, 2, {
   {"file", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"gridfile",NULL,NULL,NULL,NULL,NULL},
   {"size", NSF_ARG_REQUIRED, 1, Nsf_ConvertToInt32, NULL,NULL,"int32",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::index", NsfMongoIndexStub, 5, {
   {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"mongo_connection",NULL,NULL,NULL,NULL,NULL},
-  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"attributes", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,"tclobj",NULL,NULL,NULL,NULL,NULL},
-  {"-dropdups", 0, 0, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"-unique", 0, 0, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL}}
+  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"attributes", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-dropdups", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-unique", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::insert", NsfMongoInsertStub, 3, {
   {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"mongo_connection",NULL,NULL,NULL,NULL,NULL},
-  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"values", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,"tclobj",NULL,NULL,NULL,NULL,NULL}}
+  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"values", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::query", NsfMongoQueryStub, 6, {
   {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"mongo_connection",NULL,NULL,NULL,NULL,NULL},
-  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"query", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,"tclobj",NULL,NULL,NULL,NULL,NULL},
-  {"-atts", 0, 1, Nsf_ConvertToTclobj, NULL,NULL,"tclobj",NULL,NULL,NULL,NULL,NULL},
+  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"query", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-atts", 0, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-limit", 0, 1, Nsf_ConvertToInt32, NULL,NULL,"int32",NULL,NULL,NULL,NULL,NULL},
   {"-skip", 0, 1, Nsf_ConvertToInt32, NULL,NULL,"int32",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::remove", NsfMongoRemoveStub, 3, {
   {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"mongo_connection",NULL,NULL,NULL,NULL,NULL},
-  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"condition", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,"tclobj",NULL,NULL,NULL,NULL,NULL}}
+  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"condition", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::update", NsfMongoUpdateStub, 6, {
   {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"mongo_connection",NULL,NULL,NULL,NULL,NULL},
-  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"cond", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,"tclobj",NULL,NULL,NULL,NULL,NULL},
-  {"values", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,"tclobj",NULL,NULL,NULL,NULL,NULL},
-  {"-upsert", 0, 0, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL},
-  {"-all", 0, 0, Nsf_ConvertToString, NULL,NULL,"",NULL,NULL,NULL,NULL,NULL}}
+  {"namespace", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"cond", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"values", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-upsert", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-all", 0, 0, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },{NULL}
 };