Index: generic/nsfInt.h
===================================================================
diff -u -N -r56771aadda62cc84f8631070e54c87e9f2e26c8b -refe655eee129abd5c704299a029e0e39d80d2218
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 56771aadda62cc84f8631070e54c87e9f2e26c8b)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision efe655eee129abd5c704299a029e0e39d80d2218)
@@ -788,7 +788,9 @@
 
 #define NsfGlobalObjs RUNTIME_STATE(interp)->methodObjNames
 
-/* obj types */
+/* 
+ * Interface for Tcl_Obj types 
+ */
 EXTERN Tcl_ObjType NsfMixinregObjType;
 EXTERN int NsfMixinregGet(Tcl_Interp *interp, Tcl_Obj *obj, NsfClass **classPtr, Tcl_Obj **guardObj)
   nonnull(1) nonnull(2) nonnull(3) nonnull(4);
@@ -799,10 +801,13 @@
 EXTERN int NsfFilterregGet(Tcl_Interp *interp, Tcl_Obj *obj, Tcl_Obj **filterObj, Tcl_Obj **guardObj)
   nonnull(1) nonnull(2) nonnull(3) nonnull(4);
 
-EXTERN NsfClassOpt *NsfRequireClassOpt(/*@notnull@*/ NsfClass *cl) nonnull(1) returns_nonnull;
+EXTERN NsfClassOpt *NsfRequireClassOpt(NsfClass *class)
+  nonnull(1) returns_nonnull;
 
 
-/* Next Scripting ShadowTclCommands */
+/* 
+ * Next Scripting ShadowTclCommands 
+ */
 typedef struct NsfShadowTclCommandInfo {
   TclObjCmdProcType proc;
   ClientData clientData;