Index: generic/nsf.c
===================================================================
diff -u -rba23ab58bc8dd8018eb4de475a104619abc8a128 -r7401c1c91b67a9adc5b3c1a9049a37a9d8e13c93
--- generic/nsf.c	(.../nsf.c)	(revision ba23ab58bc8dd8018eb4de475a104619abc8a128)
+++ generic/nsf.c	(.../nsf.c)	(revision 7401c1c91b67a9adc5b3c1a9049a37a9d8e13c93)
@@ -180,11 +180,6 @@
 
 static Nsf_TypeConverter ConvertToNothing, ConvertViaCmd, ConvertToObjpattern;
 
-typedef struct {
-  Nsf_TypeConverter *converter;
-  char *domain;
-} enumeratorConverterEntry;
-
 /*
  * Tcl_Obj Types for Next Scripting Objects
  */
@@ -209,7 +204,7 @@
 static Tcl_ObjCmdProc NsfAsmProc;
 
 
-/* prototypes for methods called directly when CallDirectly() returns NULL */
+/* Prototypes for methods called directly when CallDirectly() returns NULL */
 static int NsfCAllocMethod(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *nameObj);
 static int NsfCAllocMethod_(Tcl_Interp *interp, NsfClass *cl, Tcl_Obj *nameObj, Tcl_Namespace *parentNsPtr);
 static int NsfCCreateMethod(Tcl_Interp *interp, NsfClass *cl, CONST char *name, int objc, Tcl_Obj *CONST objv[]);
@@ -5210,9 +5205,9 @@
 
 #if !defined(NDEBUG)
   if (screenedObject) {
-    fprintf(stderr, "SCREENED OBJECT %s found: object %p (%s) cmd %p\n",
-	    Tcl_GetCommandName(interp, cmdPtr), screenedObject,
-	    ObjectName(screenedObject), cmdPtr);
+    NsfLog(interp, NSF_LOG_NOTICE, "screened object %s found: object %p (%s) cmd %p",
+	   Tcl_GetCommandName(interp, cmdPtr), screenedObject,
+	   ObjectName(screenedObject), cmdPtr);
   }
 #endif
   return screenedObject;
@@ -9599,7 +9594,7 @@
 
   assert(paramPtr);
   if ((paramPtr->flags & NSF_ARG_IS_ENUMERATION)) {
-    enumeratorConverterEntry *ePtr;
+    Nsf_EnumeratorConverterEntry *ePtr;
     for (ePtr = &enumeratorConverterEntries[0]; ePtr->converter; ePtr++) {
       if (ePtr->converter == paramPtr->converter) {
 	result = ePtr->domain;
@@ -26040,5 +26035,6 @@
  * mode: c
  * c-basic-offset: 2
  * fill-column: 78
+ * indent-tabs-mode: nil
  * End:
  */