Index: generic/nsf.c
===================================================================
diff -u -r5b2eafb18ce22d7aa8cef352f535da5046cac7d9 -rc2baf6c2b4e9a88c3580bdadf5e735dfe96d7f10
--- generic/nsf.c	(.../nsf.c)	(revision 5b2eafb18ce22d7aa8cef352f535da5046cac7d9)
+++ generic/nsf.c	(.../nsf.c)	(revision c2baf6c2b4e9a88c3580bdadf5e735dfe96d7f10)
@@ -7794,7 +7794,7 @@
 
   if (proc == TclObjInterpProc) {
 #if defined(NRE)
-    TEOV_callback *rootPtr = TOP_CB(interp);
+    NRE_callback *rootPtr = TOP_CB(interp);
 #endif
     /*
      * The cmd is a scripted method
@@ -8500,7 +8500,7 @@
     NsfErrorContext(interp, "method destroy");
 
     if (++rst->errorCount > 20) {
-      Tcl_Panic("too many destroy errors occured. Endless loop?", NULL);
+      Tcl_Panic("too many destroy errors occured. Endless loop?");
     }
   } else if (rst->errorCount > 0) {
     rst->errorCount--;