Index: generic/xotcl.c
===================================================================
diff -u -re5cee71c4fdd11860c1a897522c6d4202ebc64c4 -r930db9f3c2dc7b83ba64cbb1c600242ed650adab
--- generic/xotcl.c	(.../xotcl.c)	(revision e5cee71c4fdd11860c1a897522c6d4202ebc64c4)
+++ generic/xotcl.c	(.../xotcl.c)	(revision 930db9f3c2dc7b83ba64cbb1c600242ed650adab)
@@ -1834,7 +1834,7 @@
   }
 
 #if defined(VAR_RESOLVER_TRACE)
-  fprintf(stderr, "InterpDotVarResolver called var=%s flags %.4x\n", varName, flags);
+  fprintf(stderr, "InterpDotVarResolver called var '%s' flags %.4x\n", varName, flags);
 #endif
   varName ++;
   varFramePtr = Tcl_Interp_varFramePtr(interp);
@@ -5430,7 +5430,7 @@
           );
 # endif
 
-  if (opt && object->teardown && (object->checkoptions & CHECK_POST)) {
+  if (opt && object->teardown && (opt->checkoptions & CHECK_POST)) {
     /* even, when the passed result != TCL_OK, run assertion to report
      * the highest possible method from the callstack (e.g. "set" would not
      * be very meaningful; however, do not flush a TCL_ERROR.
@@ -5713,11 +5713,8 @@
 #endif
 
   /*fprintf(stderr, "CmdDispatch obj %p %p %s\n", obj, methodName, methodName);*/
-#if !defined(NRE)
-  result = (*Tcl_Command_objProc(cmdPtr))(cp, interp, objc, objv);
-#else
   result = Tcl_NRCallObjProc(interp, Tcl_Command_objProc(cmdPtr), cp, objc, objv);
-#endif
+
 #ifdef DISPATCH_TRACE
   printExit(interp, "CmdMethodDispatch cmd", objc, objv, result);
 #endif
@@ -9281,11 +9278,11 @@
   XOTclObject *object = tcd->obj;
   int result;
   XOTcl_FrameDecls;
-  /*fprintf(stderr, "objscopedMethod obj=%p %s, ptr=%p\n", obj, objectName(obj), tcd->objProc);*/
+  /*fprintf(stderr, "objscopedMethod obj=%p %s, ptr=%p\n", object, objectName(object), tcd->objProc);*/
 
   XOTcl_PushFrameObj(interp, object);
 
-#if 1 || !defined(NRE)
+#if !defined(NRE)
   result = (*tcd->objProc)(tcd->clientData, interp, objc, objv);
 #else
   result = Tcl_NRCallObjProc(interp, tcd->objProc, tcd->clientData, objc, objv);