Index: generic/nsfAccessInt.h
===================================================================
diff -u -N -r880487204ff2da18d2d25ebd727b9b4bbda86c8e -rb361d502bbf5fc7920797d064ec21bd111d11081
--- generic/nsfAccessInt.h	(.../nsfAccessInt.h)	(revision 880487204ff2da18d2d25ebd727b9b4bbda86c8e)
+++ generic/nsfAccessInt.h	(.../nsfAccessInt.h)	(revision b361d502bbf5fc7920797d064ec21bd111d11081)
@@ -90,11 +90,19 @@
 # define Tcl_HashSize(tablePtr) ((tablePtr)->numEntries)
 #endif
 
+static NSF_INLINE NsfObject*NsfGetObjectFromCmdPtr(Tcl_Command cmd) nonnull(1);
+static NSF_INLINE NsfClass*NsfGetClassFromCmdPtr(Tcl_Command cmd) nonnull(1);
+static NSF_INLINE ClientData NsfGetClientDataFromCmdPtr(Tcl_Command cmd) nonnull(1);
+static NSF_INLINE Var *VarHashCreateVar(TclVarHashTable *tablePtr, Tcl_Obj *key, int *newPtr) nonnull(1) nonnull(2);
+
 static NSF_INLINE Var *
 VarHashCreateVar(TclVarHashTable *tablePtr, Tcl_Obj *key, int *newPtr) {
   Var *varPtr = NULL;
   Tcl_HashEntry *hPtr;
 
+  assert(tablePtr);
+  assert(key);
+
   hPtr = Tcl_CreateHashEntry((Tcl_HashTable *) tablePtr,
                              (char *) key, newPtr);
   if (likely(hPtr != NULL)) {
@@ -133,6 +141,7 @@
 static NSF_INLINE NsfClass*
 NsfGetClassFromCmdPtr(Tcl_Command cmd) {
   ClientData cd = NsfGetClientDataFromCmdPtr(cmd);
+  assert(cmd);
   /*fprintf(stderr, "cd=%p\n",cd);*/
   if (likely(cd != NULL)) {
     return NsfObjectToClass(cd);
@@ -143,6 +152,7 @@
 
 static NSF_INLINE NsfObject*
 NsfGetObjectFromCmdPtr(Tcl_Command cmd) {
+  assert(cmd);
   return (NsfObject*) NsfGetClientDataFromCmdPtr(cmd);
 }