Index: generic/nsf.c
===================================================================
diff -u -N -r371e0e38e4601fd512d0d2e6bb4b78f2598ede62 -r5ba58733544bf94e92b9dc86ae1515770e2c909c
--- generic/nsf.c	(.../nsf.c)	(revision 371e0e38e4601fd512d0d2e6bb4b78f2598ede62)
+++ generic/nsf.c	(.../nsf.c)	(revision 5ba58733544bf94e92b9dc86ae1515770e2c909c)
@@ -4067,7 +4067,9 @@
     }
   }
 
-  /* now, turn of filters, all destroy callbacks are done */
+  /*
+   * Now turn off filters, all destroy callbacks are done.
+   */
   RUNTIME_STATE(interp)->doFilters = 0;
   (void)Tcl_RemoveInterpResolvers(interp, "nsf");
   
@@ -4078,14 +4080,18 @@
 # endif
 #endif
 
-  /* now free all objects systems with their root classes */
+  /*
+   * Free all objects systems with their root classes.
+   */
   for (osPtr = RUNTIME_STATE(interp)->objectSystems; osPtr != NULL; osPtr = nPtr) {
     nPtr = osPtr->nextPtr;
     ObjectSystemFree(interp, osPtr);
   }
 
 #ifdef DO_CLEANUP
-  /* finally, free all nsfprocs */
+  /*
+   * Finally, free all nsfprocs.
+   */
   DeleteNsfProcs(interp, NULL);
 #endif
 
@@ -26360,13 +26366,17 @@
       if (objectproperty == ObjectpropertySlotcontainerIdx) {
         assert(object->nsPtr != NULL);
         if (flagValue != 0) {
-          /* turn on SlotContainerCmdResolver */
+          /*
+           * Turn on SlotContainerCmdResolver.
+           */
           Tcl_SetNamespaceResolvers(object->nsPtr,
                                     (Tcl_ResolveCmdProc *)SlotContainerCmdResolver,
                                     NsColonVarResolver,
                                     (Tcl_ResolveCompiledVarProc *)NULL);
         } else {
-          /* turn off SlotContainerCmdResolver */
+          /*
+           * Turn off SlotContainerCmdResolver.
+           */
           Tcl_SetNamespaceResolvers(object->nsPtr,
                                     (Tcl_ResolveCmdProc *)NULL,
                                     NsColonVarResolver,