Index: library/mongodb/mongoAPI.h
===================================================================
diff -u -N -r872d1371a257c8a20383ae70efa83bbf3ff78f96 -raaf54b0b2c0f94de46aefd72cc8172a77359c073
--- library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision 872d1371a257c8a20383ae70efa83bbf3ff78f96)
+++ library/mongodb/mongoAPI.h	(.../mongoAPI.h)	(revision aaf54b0b2c0f94de46aefd72cc8172a77359c073)
@@ -1,6 +1,6 @@
 
 /*
- * This source code file was generated by the C-code generator gentclAPI.tcl, 
+ * This source code file was generated by the C-code generator gentclAPI.tcl,
  * part of the Next Scripting Framework.
  */
 
@@ -49,10 +49,10 @@
 #endif
 
 
-#if !defined(likely) 
+#if !defined(likely)
 # if defined(__GNUC__) && __GNUC__ > 2
 /* Use gcc branch prediction hint to minimize cost of e.g. DTrace
- * ENABLED checks. 
+ * ENABLED checks.
  */
 #  define unlikely(x) (__builtin_expect((x), 0))
 #  define likely(x) (__builtin_expect((x), 1))
@@ -66,7 +66,7 @@
 
 enum GridfilesourceIdx {GridfilesourceNULL, GridfilesourceFileIdx, GridfilesourceStringIdx};
 
-static int ConvertToGridfilesource(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToGridfilesource(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"file", "string", NULL};
@@ -241,8 +241,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfCollectionCloseIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfCollectionCloseIdx].paramDefs,
                      method_definitions[NsfCollectionCloseIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0];
@@ -260,8 +260,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfCollectionOpenIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfCollectionOpenIdx].paramDefs,
                      method_definitions[NsfCollectionOpenIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_client_t *connPtr = (mongoc_client_t *)pc.clientData[0];
@@ -281,8 +281,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCloseIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCloseIdx].paramDefs,
                      method_definitions[NsfMongoCloseIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_client_t *connPtr = (mongoc_client_t *)pc.clientData[0];
@@ -300,8 +300,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCollectionCountIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCollectionCountIdx].paramDefs,
                      method_definitions[NsfMongoCollectionCountIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0];
@@ -320,8 +320,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCollectionDeleteIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCollectionDeleteIdx].paramDefs,
                      method_definitions[NsfMongoCollectionDeleteIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0];
@@ -340,8 +340,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCollectionIndexIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCollectionIndexIdx].paramDefs,
                      method_definitions[NsfMongoCollectionIndexIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0];
@@ -366,8 +366,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCollectionInsertIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCollectionInsertIdx].paramDefs,
                      method_definitions[NsfMongoCollectionInsertIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0];
@@ -386,8 +386,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCollectionQueryIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCollectionQueryIdx].paramDefs,
                      method_definitions[NsfMongoCollectionQueryIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0];
@@ -409,8 +409,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCollectionStatsIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCollectionStatsIdx].paramDefs,
                      method_definitions[NsfMongoCollectionStatsIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0];
@@ -429,8 +429,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCollectionUpdateIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCollectionUpdateIdx].paramDefs,
                      method_definitions[NsfMongoCollectionUpdateIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0];
@@ -452,8 +452,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoConnectIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoConnectIdx].paramDefs,
                      method_definitions[NsfMongoConnectIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *withUri = (CONST char *)pc.clientData[0];
@@ -471,8 +471,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCursorAggregateIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCursorAggregateIdx].paramDefs,
                      method_definitions[NsfMongoCursorAggregateIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0];
@@ -494,8 +494,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCursorCloseIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCursorCloseIdx].paramDefs,
                      method_definitions[NsfMongoCursorCloseIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_cursor_t *cursorPtr = (mongoc_cursor_t *)pc.clientData[0];
@@ -513,8 +513,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCursorFindIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCursorFindIdx].paramDefs,
                      method_definitions[NsfMongoCursorFindIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_collection_t *collectionPtr = (mongoc_collection_t *)pc.clientData[0];
@@ -538,8 +538,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoCursorNextIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoCursorNextIdx].paramDefs,
                      method_definitions[NsfMongoCursorNextIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_cursor_t *cursorPtr = (mongoc_cursor_t *)pc.clientData[0];
@@ -557,8 +557,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFSCloseIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFSCloseIdx].paramDefs,
                      method_definitions[NsfMongoGridFSCloseIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_gridfs_t *gfsPtr = (mongoc_gridfs_t *)pc.clientData[0];
@@ -576,8 +576,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFSOpenIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFSOpenIdx].paramDefs,
                      method_definitions[NsfMongoGridFSOpenIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_client_t *connPtr = (mongoc_client_t *)pc.clientData[0];
@@ -597,8 +597,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFileCloseIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFileCloseIdx].paramDefs,
                      method_definitions[NsfMongoGridFileCloseIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_gridfs_file_t *gridfilePtr = (mongoc_gridfs_file_t *)pc.clientData[0];
@@ -616,8 +616,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFileCreateIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFileCreateIdx].paramDefs,
                      method_definitions[NsfMongoGridFileCreateIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withSource = (int )PTR2INT(pc.clientData[0]);
@@ -640,8 +640,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFileDeleteIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFileDeleteIdx].paramDefs,
                      method_definitions[NsfMongoGridFileDeleteIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_gridfs_t *gfsPtr = (mongoc_gridfs_t *)pc.clientData[0];
@@ -660,8 +660,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFileGetContentTypeIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFileGetContentTypeIdx].paramDefs,
                      method_definitions[NsfMongoGridFileGetContentTypeIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_gridfs_file_t *gridfilePtr = (mongoc_gridfs_file_t *)pc.clientData[0];
@@ -679,8 +679,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFileGetContentlengthIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFileGetContentlengthIdx].paramDefs,
                      method_definitions[NsfMongoGridFileGetContentlengthIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_gridfs_file_t *gridfilePtr = (mongoc_gridfs_file_t *)pc.clientData[0];
@@ -698,8 +698,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFileGetMetaDataIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFileGetMetaDataIdx].paramDefs,
                      method_definitions[NsfMongoGridFileGetMetaDataIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_gridfs_file_t *gridfilePtr = (mongoc_gridfs_file_t *)pc.clientData[0];
@@ -717,8 +717,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFileOpenIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFileOpenIdx].paramDefs,
                      method_definitions[NsfMongoGridFileOpenIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_gridfs_t *gfsPtr = (mongoc_gridfs_t *)pc.clientData[0];
@@ -737,8 +737,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFileReadIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFileReadIdx].paramDefs,
                      method_definitions[NsfMongoGridFileReadIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_gridfs_file_t *gridfilePtr = (mongoc_gridfs_file_t *)pc.clientData[0];
@@ -757,8 +757,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoGridFileSeekIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoGridFileSeekIdx].paramDefs,
                      method_definitions[NsfMongoGridFileSeekIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_gridfs_file_t *gridfilePtr = (mongoc_gridfs_file_t *)pc.clientData[0];
@@ -777,8 +777,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoRunCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoRunCmdIdx].paramDefs,
                      method_definitions[NsfMongoRunCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withNocomplain = (int )PTR2INT(pc.clientData[0]);
@@ -799,8 +799,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMongoStatusIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMongoStatusIdx].paramDefs,
                      method_definitions[NsfMongoStatusIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     mongoc_client_t *connPtr = (mongoc_client_t *)pc.clientData[0];