Index: generic/nsfInt.h
===================================================================
diff -u -rbedb248602f8940383c0f4a10bb4f99b3a5f2c4f -r17cf9791655c4680499c4ab755df3b49dfa4cf06
--- generic/nsfInt.h	(.../nsfInt.h)	(revision bedb248602f8940383c0f4a10bb4f99b3a5f2c4f)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 17cf9791655c4680499c4ab755df3b49dfa4cf06)
@@ -640,13 +640,12 @@
 #define NSF_CM_NO_SHIFT   2
 #define NSF_CM_NO_PROTECT 4
 #define NSF_CM_NO_OBJECT_METHOD 8
-#define NSF_CM_DELGATE    0x10  /* TODO: needed? */
 
 #if defined(NRE)
 # define NsfImmediateFromCallerFlags(flags) \
   (((flags) & (NSF_CSC_CALL_IS_NRE|NSF_CSC_IMMEDIATE)) == NSF_CSC_CALL_IS_NRE ? 0 : NSF_CSC_IMMEDIATE)
 
-//#define NRE_SANE_PATCH 1
+// #define NRE_SANE_PATCH 1
 
 #if defined(NRE_SANE_PATCH)
 # define NsfNRRunCallbacks(interp, result, rootPtr) TclNRRunCallbacks(interp, result, rootPtr)
Index: tests/interceptor-slot.tcl
===================================================================
diff -u -rbedb248602f8940383c0f4a10bb4f99b3a5f2c4f -r17cf9791655c4680499c4ab755df3b49dfa4cf06
--- tests/interceptor-slot.tcl	(.../interceptor-slot.tcl)	(revision bedb248602f8940383c0f4a10bb4f99b3a5f2c4f)
+++ tests/interceptor-slot.tcl	(.../interceptor-slot.tcl)	(revision 17cf9791655c4680499c4ab755df3b49dfa4cf06)
@@ -142,13 +142,19 @@
     :public method baz {} {next}
   }
 
-  # define nx unknown handler in case it does not exist
+  ? {Foo create ob} ::ob
+
+  # make sure, no unknown handler exists
+  ? {::ob info lookup method unknown} ""
+
+  ? {ob bar} {::ob: unable to dispatch method 'bar'}
+  ? {ob baz} {}
+
+  # define a global unknown handler
   ::nx::Object protected method unknown {m args} {
-    puts stderr XXXXX
     error "[::nsf::current object]: unable to dispatch method '$m'"
   }
 
-  ? {Foo create ob} ::ob
   ? {ob bar} {::ob: unable to dispatch method 'bar'}
   ? {ob baz} {}