Index: generic/nsf.c
===================================================================
diff -u -rf31c1a01c6a389f693b8db0f2204cbb46180fef1 -rdbe0bb3d2a84a4f0836d45aaacb3d4354d6e8805
--- generic/nsf.c	(.../nsf.c)	(revision f31c1a01c6a389f693b8db0f2204cbb46180fef1)
+++ generic/nsf.c	(.../nsf.c)	(revision dbe0bb3d2a84a4f0836d45aaacb3d4354d6e8805)
@@ -21316,7 +21316,9 @@
          */
         pcPtr->flags[i] |= NSF_PC_IS_DEFAULT;
 
-        /* Is it necessary to substitute the default value? */
+        /*
+         * Does the user want to substitute in the default value?
+         */
         if (unlikely((pPtr->flags & NSF_ARG_SUBST_DEFAULT) != 0u)) {
           Tcl_Obj *obj = Tcl_SubstObj(interp, newValue, TCL_SUBST_ALL);
 
@@ -31181,11 +31183,12 @@
 
 static void
 Nsf_ThreadExitProc(ClientData clientData) {
-  /*fprintf(stderr, "+++ Nsf_ThreadExitProc\n");*/
   void Nsf_ExitProc(ClientData clientData);
 
   assert(clientData != NULL);
 
+  /*fprintf(stderr, "+++ Nsf_ThreadExitProc\n");*/
+
   Tcl_DeleteExitHandler(Nsf_ExitProc, clientData);
   ExitHandler(clientData);
 }