Index: generic/nsf.c
===================================================================
diff -u -N -rb2902b78f53fb056a18e45f85f2e5df5fcec925b -r625e5b42ce67fb5b427852f477e9dac8746e8025
--- generic/nsf.c	(.../nsf.c)	(revision b2902b78f53fb056a18e45f85f2e5df5fcec925b)
+++ generic/nsf.c	(.../nsf.c)	(revision 625e5b42ce67fb5b427852f477e9dac8746e8025)
@@ -16102,7 +16102,7 @@
       return TCL_ERROR;
     }
 
-    if (Nsf_PointerTypeLookup(interp, Tcl_DStringValue(dsPtr))) {
+    if (Nsf_PointerTypeLookup(Tcl_DStringValue(dsPtr))) {
       /*
        * Check, if the option refers to a pointer converter
        */
@@ -33262,7 +33262,7 @@
    * definitions tables and load it with the generated information for
    * introspection.
    */
-  Nsf_PointerInit(interp);
+  Nsf_PointerInit();
 
   Nsf_EnumerationTypeInit();
   result = Nsf_EnumerationTypeRegister(interp, enumeratorConverterEntries);
Index: generic/nsf.h
===================================================================
diff -u -N -r8552f707c011bfc24be22e1e8332f5558227cde3 -r625e5b42ce67fb5b427852f477e9dac8746e8025
--- generic/nsf.h	(.../nsf.h)	(revision 8552f707c011bfc24be22e1e8332f5558227cde3)
+++ generic/nsf.h	(.../nsf.h)	(revision 625e5b42ce67fb5b427852f477e9dac8746e8025)
@@ -449,14 +449,13 @@
 EXTERN int Nsf_PointerDelete(const char *key, void *valuePtr, int free)
   NSF_nonnull(2);
 
-EXTERN void Nsf_PointerInit(Tcl_Interp *interp)
-  NSF_nonnull(1);
+EXTERN void Nsf_PointerInit(void);
 
 EXTERN void Nsf_PointerExit(Tcl_Interp *interp)
   NSF_nonnull(1);
 
-EXTERN void *Nsf_PointerTypeLookup(Tcl_Interp *interp, const char* typeName)
-  NSF_nonnull(1) NSF_nonnull(2);
+EXTERN void *Nsf_PointerTypeLookup(const char* typeName)
+  NSF_nonnull(1);
 
 EXTERN int Nsf_PointerTypeRegister(Tcl_Interp *interp, const char* typeName, int *counterPtr)
   NSF_nonnull(1) NSF_nonnull(2) NSF_nonnull(3);
Index: generic/nsfEnumerationType.c
===================================================================
diff -u -N -r88a4a36bce68febc0be48bf4828521f6a0d5ddcc -r625e5b42ce67fb5b427852f477e9dac8746e8025
--- generic/nsfEnumerationType.c	(.../nsfEnumerationType.c)	(revision 88a4a36bce68febc0be48bf4828521f6a0d5ddcc)
+++ generic/nsfEnumerationType.c	(.../nsfEnumerationType.c)	(revision 625e5b42ce67fb5b427852f477e9dac8746e8025)
@@ -43,7 +43,7 @@
 static int enumerationTypeRefCount = 0;
 static NsfMutex enumerationMutex = 0;
 
-static int Register(Tcl_Interp *interp, const char *domain, Nsf_TypeConverter *converter) nonnull(1) nonnull(3);
+static int Register(const char *domain, Nsf_TypeConverter *converter) nonnull(2);
 /*
  *----------------------------------------------------------------------
  * Nsf_EnumerationTypeInit --
@@ -121,7 +121,7 @@
   nonnull_assert(typeRecords != NULL);
 
   for (ePtr = typeRecords; ePtr->converter; ePtr++) {
-    int result = Register(interp, ePtr->domain, ePtr->converter);
+    int result = Register(ePtr->domain, ePtr->converter);
     if (unlikely(result != TCL_OK)) {
       return result;
     }
@@ -181,11 +181,10 @@
  */
 
 static int
-Register(Tcl_Interp *interp, const char *domain, Nsf_TypeConverter *converter) {
+Register(const char *domain, Nsf_TypeConverter *converter) {
   Tcl_HashEntry *hPtr;
   int isNew;
 
-  nonnull_assert(interp != NULL);
   nonnull_assert(converter != NULL);
 
   NsfMutexLock(&enumerationMutex);
Index: generic/nsfPointer.c
===================================================================
diff -u -N -r37c87756387c17e0f2f43634c0d452a91f91c844 -r625e5b42ce67fb5b427852f477e9dac8746e8025
--- generic/nsfPointer.c	(.../nsfPointer.c)	(revision 37c87756387c17e0f2f43634c0d452a91f91c844)
+++ generic/nsfPointer.c	(.../nsfPointer.c)	(revision 625e5b42ce67fb5b427852f477e9dac8746e8025)
@@ -67,7 +67,7 @@
   nonnull_assert(typeName != NULL);
   nonnull_assert(valuePtr != NULL);
 
-  counterPtr = Nsf_PointerTypeLookup(interp, typeName);
+  counterPtr = Nsf_PointerTypeLookup(typeName);
   if (counterPtr != NULL) {
     Tcl_DString    ds, *dsPtr = &ds;
     Tcl_HashEntry *hPtr;
@@ -314,10 +314,9 @@
  */
 
 void *
-Nsf_PointerTypeLookup(Tcl_Interp *interp, const char* typeName) {
+Nsf_PointerTypeLookup(const char* typeName) {
   const Tcl_HashEntry *hPtr;
 
-  nonnull_assert(interp != NULL);
   nonnull_assert(typeName != NULL);
 
   NsfMutexLock(&pointerMutex);
@@ -346,10 +345,8 @@
  */
 
 void
-Nsf_PointerInit(Tcl_Interp *interp) {
+Nsf_PointerInit(void) {
 
-  nonnull_assert(interp != NULL);
-
   NsfMutexLock(&pointerMutex);
 
   if (pointerTableRefCount == 0) {
Index: generic/nsfProfile.c
===================================================================
diff -u -N -red88632709d9a9aa87619b5bc4d68e57d8b47d8d -r625e5b42ce67fb5b427852f477e9dac8746e8025
--- generic/nsfProfile.c	(.../nsfProfile.c)	(revision ed88632709d9a9aa87619b5bc4d68e57d8b47d8d)
+++ generic/nsfProfile.c	(.../nsfProfile.c)	(revision 625e5b42ce67fb5b427852f477e9dac8746e8025)
@@ -108,12 +108,12 @@
  *----------------------------------------------------------------------
  */
 void
-NsfProfileDeprecatedCall(Tcl_Interp *interp, NsfObject *object, NsfClass *class,
+NsfProfileDeprecatedCall(Tcl_Interp *interp, NsfObject *UNUSED(object), NsfClass *class,
                          const char *methodName, const char *altMethod) {
   Tcl_DString ds;
 
   nonnull_assert(interp != NULL);
-  nonnull_assert(object != NULL);
+  //nonnull_assert(object != NULL);
   nonnull_assert(methodName != NULL);
   nonnull_assert(altMethod != NULL);