Index: library/mongodb/mongoAPI.h
===================================================================
diff -u -N -rdf67ed7db2b0cda881c4a9e704379a2a02d415b6 -r17ba2f1d86be4afd497d652b7ee39a5edc771a22
--- library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision df67ed7db2b0cda881c4a9e704379a2a02d415b6)
+++ library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision 17ba2f1d86be4afd497d652b7ee39a5edc771a22)
@@ -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, Tcl_Obj *conn);
+static int NsfMongoClose(Tcl_Interp *interp, mongo_connection *mongo_connectionPtr);
 static int NsfMongoConnect(Tcl_Interp *interp, CONST char *withReplica_set, Tcl_Obj *withServer);
-static int NsfMongoCount(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *namespace, Tcl_Obj *query);
-static int NsfMongoGridFSClose(Tcl_Interp *interp, Tcl_Obj *gfs);
-static int NsfMongoGridFSOpen(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *dbname, CONST char *prefix);
-static int NsfMongoGridFSRemoveFile(Tcl_Interp *interp, Tcl_Obj *gfs, CONST char *filename);
-static int NsfMongoGridFSStoreFile(Tcl_Interp *interp, Tcl_Obj *gfs, CONST char *filename, CONST char *remotename, CONST char *contenttype);
-static int NsfMongoGridFileClose(Tcl_Interp *interp, Tcl_Obj *gridfile);
-static int NsfMongoGridFileGetContentType(Tcl_Interp *interp, Tcl_Obj *gridfile);
-static int NsfMongoGridFileGetContentlength(Tcl_Interp *interp, Tcl_Obj *gridfile);
-static int NsfMongoGridFileGetMetaData(Tcl_Interp *interp, Tcl_Obj *gridfile);
-static int NsfMongoGridFileOpen(Tcl_Interp *interp, Tcl_Obj *gfs, CONST char *filename);
-static int NsfMongoGridFileRead(Tcl_Interp *interp, Tcl_Obj *gridfile, int size);
-static int NsfMongoIndex(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *namespace, Tcl_Obj *attributes, int withDropdups, int withUnique);
-static int NsfMongoInsert(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *namespace, Tcl_Obj *values);
-static int NsfMongoQuery(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *namespace, Tcl_Obj *query, Tcl_Obj *withAtts, int withLimit, int withSkip);
-static int NsfMongoRemove(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *namespace, Tcl_Obj *condition);
-static int NsfMongoUpdate(Tcl_Interp *interp, Tcl_Obj *conn, CONST char *namespace, Tcl_Obj *cond, Tcl_Obj *values, int withUpsert, int withAll);
+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);
 
 enum {
  NsfMongoCloseIdx,
@@ -68,18 +68,21 @@
 
 static int
 NsfMongoCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
   (void)clientData;
 
-    
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoCloseIdx].paramDefs, 
+                     method_definitions[NsfMongoCloseIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    mongo_connection *mongo_connectionPtr = (mongo_connection *)pc.clientData[0];
 
-      if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
-			     method_definitions[NsfMongoCloseIdx].paramDefs,
-			     NULL, objv[0]); 
-      }
-    
-    return NsfMongoClose(interp, objc == 2 ? objv[1] : NULL);
+    assert(pc.status == 0);
+    return NsfMongoClose(interp, mongo_connectionPtr);
 
+  }
 }
 
 static int
@@ -113,30 +116,33 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *conn = (Tcl_Obj *)pc.clientData[0];
+    mongo_connection *mongo_connectionPtr = (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, conn, namespace, query);
+    return NsfMongoCount(interp, mongo_connectionPtr, namespace, query);
 
   }
 }
 
 static int
 NsfMongoGridFSCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
   (void)clientData;
 
-    
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoGridFSCloseIdx].paramDefs, 
+                     method_definitions[NsfMongoGridFSCloseIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    gridfs *gridfsPtr = (gridfs *)pc.clientData[0];
 
-      if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
-			     method_definitions[NsfMongoGridFSCloseIdx].paramDefs,
-			     NULL, objv[0]); 
-      }
-    
-    return NsfMongoGridFSClose(interp, objc == 2 ? objv[1] : NULL);
+    assert(pc.status == 0);
+    return NsfMongoGridFSClose(interp, gridfsPtr);
 
+  }
 }
 
 static int
@@ -150,12 +156,12 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *conn = (Tcl_Obj *)pc.clientData[0];
+    mongo_connection *mongo_connectionPtr = (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, conn, dbname, prefix);
+    return NsfMongoGridFSOpen(interp, mongo_connectionPtr, dbname, prefix);
 
   }
 }
@@ -171,11 +177,11 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *gfs = (Tcl_Obj *)pc.clientData[0];
+    gridfs *gridfsPtr = (gridfs *)pc.clientData[0];
     CONST char *filename = (CONST char *)pc.clientData[1];
 
     assert(pc.status == 0);
-    return NsfMongoGridFSRemoveFile(interp, gfs, filename);
+    return NsfMongoGridFSRemoveFile(interp, gridfsPtr, filename);
 
   }
 }
@@ -191,79 +197,91 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *gfs = (Tcl_Obj *)pc.clientData[0];
+    gridfs *gridfsPtr = (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, gfs, filename, remotename, contenttype);
+    return NsfMongoGridFSStoreFile(interp, gridfsPtr, filename, remotename, contenttype);
 
   }
 }
 
 static int
 NsfMongoGridFileCloseStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
   (void)clientData;
 
-    
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoGridFileCloseIdx].paramDefs, 
+                     method_definitions[NsfMongoGridFileCloseIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    gridfile *gridfilePtr = (gridfile *)pc.clientData[0];
 
-      if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
-			     method_definitions[NsfMongoGridFileCloseIdx].paramDefs,
-			     NULL, objv[0]); 
-      }
-    
-    return NsfMongoGridFileClose(interp, objc == 2 ? objv[1] : NULL);
+    assert(pc.status == 0);
+    return NsfMongoGridFileClose(interp, gridfilePtr);
 
+  }
 }
 
 static int
 NsfMongoGridFileGetContentTypeStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
   (void)clientData;
 
-    
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoGridFileGetContentTypeIdx].paramDefs, 
+                     method_definitions[NsfMongoGridFileGetContentTypeIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    gridfile *gridfilePtr = (gridfile *)pc.clientData[0];
 
-      if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
-			     method_definitions[NsfMongoGridFileGetContentTypeIdx].paramDefs,
-			     NULL, objv[0]); 
-      }
-    
-    return NsfMongoGridFileGetContentType(interp, objc == 2 ? objv[1] : NULL);
+    assert(pc.status == 0);
+    return NsfMongoGridFileGetContentType(interp, gridfilePtr);
 
+  }
 }
 
 static int
 NsfMongoGridFileGetContentlengthStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
   (void)clientData;
 
-    
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoGridFileGetContentlengthIdx].paramDefs, 
+                     method_definitions[NsfMongoGridFileGetContentlengthIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    gridfile *gridfilePtr = (gridfile *)pc.clientData[0];
 
-      if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
-			     method_definitions[NsfMongoGridFileGetContentlengthIdx].paramDefs,
-			     NULL, objv[0]); 
-      }
-    
-    return NsfMongoGridFileGetContentlength(interp, objc == 2 ? objv[1] : NULL);
+    assert(pc.status == 0);
+    return NsfMongoGridFileGetContentlength(interp, gridfilePtr);
 
+  }
 }
 
 static int
 NsfMongoGridFileGetMetaDataStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  ParseContext pc;
   (void)clientData;
 
-    
+  if (ArgumentParse(interp, objc, objv, NULL, objv[0], 
+                     method_definitions[NsfMongoGridFileGetMetaDataIdx].paramDefs, 
+                     method_definitions[NsfMongoGridFileGetMetaDataIdx].nrParameters, 1,
+                     &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    gridfile *gridfilePtr = (gridfile *)pc.clientData[0];
 
-      if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
-			     method_definitions[NsfMongoGridFileGetMetaDataIdx].paramDefs,
-			     NULL, objv[0]); 
-      }
-    
-    return NsfMongoGridFileGetMetaData(interp, objc == 2 ? objv[1] : NULL);
+    assert(pc.status == 0);
+    return NsfMongoGridFileGetMetaData(interp, gridfilePtr);
 
+  }
 }
 
 static int
@@ -277,11 +295,11 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *gfs = (Tcl_Obj *)pc.clientData[0];
+    gridfs *gridfsPtr = (gridfs *)pc.clientData[0];
     CONST char *filename = (CONST char *)pc.clientData[1];
 
     assert(pc.status == 0);
-    return NsfMongoGridFileOpen(interp, gfs, filename);
+    return NsfMongoGridFileOpen(interp, gridfsPtr, filename);
 
   }
 }
@@ -297,11 +315,11 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *gridfile = (Tcl_Obj *)pc.clientData[0];
+    gridfile *gridfilePtr = (gridfile *)pc.clientData[0];
     int size = (int )PTR2INT(pc.clientData[1]);
 
     assert(pc.status == 0);
-    return NsfMongoGridFileRead(interp, gridfile, size);
+    return NsfMongoGridFileRead(interp, gridfilePtr, size);
 
   }
 }
@@ -317,14 +335,14 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *conn = (Tcl_Obj *)pc.clientData[0];
+    mongo_connection *mongo_connectionPtr = (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, conn, namespace, attributes, withDropdups, withUnique);
+    return NsfMongoIndex(interp, mongo_connectionPtr, namespace, attributes, withDropdups, withUnique);
 
   }
 }
@@ -340,12 +358,12 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *conn = (Tcl_Obj *)pc.clientData[0];
+    mongo_connection *mongo_connectionPtr = (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, conn, namespace, values);
+    return NsfMongoInsert(interp, mongo_connectionPtr, namespace, values);
 
   }
 }
@@ -361,15 +379,15 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *conn = (Tcl_Obj *)pc.clientData[0];
+    mongo_connection *mongo_connectionPtr = (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, conn, namespace, query, withAtts, withLimit, withSkip);
+    return NsfMongoQuery(interp, mongo_connectionPtr, namespace, query, withAtts, withLimit, withSkip);
 
   }
 }
@@ -385,12 +403,12 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *conn = (Tcl_Obj *)pc.clientData[0];
+    mongo_connection *mongo_connectionPtr = (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, conn, namespace, condition);
+    return NsfMongoRemove(interp, mongo_connectionPtr, namespace, condition);
 
   }
 }
@@ -406,102 +424,102 @@
                      &pc) != TCL_OK) {
     return TCL_ERROR;
   } else {
-    Tcl_Obj *conn = (Tcl_Obj *)pc.clientData[0];
+    mongo_connection *mongo_connectionPtr = (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, conn, namespace, cond, values, withUpsert, withAll);
+    return NsfMongoUpdate(interp, mongo_connectionPtr, namespace, cond, values, withUpsert, withAll);
 
   }
 }
 
 static Nsf_methodDefinition method_definitions[] = {
 {"::mongo::close", NsfMongoCloseStub, 1, {
-  {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"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,NULL},
-  {"-server", 0, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"-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}}
 },
 {"::mongo::count", NsfMongoCountStub, 3, {
-  {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,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}}
+  {"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}}
 },
 {"::mongo::gridfs::close", NsfMongoGridFSCloseStub, 1, {
-  {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"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_ConvertToTclobj, NULL,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}}
+  {"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}}
 },
 {"::mongo::gridfs::remove_file", NsfMongoGridFSRemoveFileStub, 2, {
-  {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"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}}
 },
 {"::mongo::gridfs::store_file", NsfMongoGridFSStoreFileStub, 4, {
-  {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,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}}
+  {"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}}
 },
 {"::mongo::gridfile::close", NsfMongoGridFileCloseStub, 1, {
-  {"gridfile", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"file", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"gridfile",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::gridfile::get_contenttype", NsfMongoGridFileGetContentTypeStub, 1, {
-  {"gridfile", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"file", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"gridfile",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::gridfile::get_contentlength", NsfMongoGridFileGetContentlengthStub, 1, {
-  {"gridfile", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"file", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"gridfile",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::gridfile::get_metadata", NsfMongoGridFileGetMetaDataStub, 1, {
-  {"gridfile", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"file", NSF_ARG_REQUIRED, 1, Nsf_ConvertToPointer, NULL,NULL,"gridfile",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::mongo::gridfile::open", NsfMongoGridFileOpenStub, 2, {
-  {"gfs", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"filename", NSF_ARG_REQUIRED, 1, Nsf_ConvertToString, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"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}}
 },
 {"::mongo::gridfile::read", NsfMongoGridFileReadStub, 2, {
-  {"gridfile", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"size", NSF_ARG_REQUIRED, 1, Nsf_ConvertToInt32, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"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_ConvertToTclobj, NULL,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}}
+  {"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}}
 },
 {"::mongo::insert", NsfMongoInsertStub, 3, {
-  {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,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}}
+  {"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}}
 },
 {"::mongo::query", NsfMongoQueryStub, 6, {
-  {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,NULL,NULL,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,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"-skip", 0, 1, Nsf_ConvertToInt32, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"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},
+  {"-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_ConvertToTclobj, NULL,NULL,NULL,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}}
+  {"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}}
 },
 {"::mongo::update", NsfMongoUpdateStub, 6, {
-  {"conn", NSF_ARG_REQUIRED, 1, Nsf_ConvertToTclobj, NULL,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}}
+  {"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}}
 },{NULL}
 };