Index: generic/xotcl.c
===================================================================
diff -u -r721a118d34e93f4149da419436efa5b17bab9b35 -r4e4b28776b65781a8624006c026986add5080cb5
--- generic/xotcl.c	(.../xotcl.c)	(revision 721a118d34e93f4149da419436efa5b17bab9b35)
+++ generic/xotcl.c	(.../xotcl.c)	(revision 4e4b28776b65781a8624006c026986add5080cb5)
@@ -721,7 +721,6 @@
 
 XOTCLINLINE static CONST char *
 GetSelfProc(Tcl_Interp *interp) {
-  /*return Tcl_GetCommandName(interp, RUNTIME_STATE(interp)->cs.top->cmdPtr);*/
   return Tcl_GetCommandName(interp, CallStackGetFrame(interp)->cmdPtr);
 
 }
@@ -1934,14 +1933,7 @@
 
 static int
 XOTcl_DeleteCommandFromToken(Tcl_Interp *interp, Tcl_Command cmd) {
-  XOTclCallStack *cs = &RUNTIME_STATE(interp)->cs;
-  XOTclCallStackContent *csc = cs->top;
-
-  for (; csc > cs->content; csc--) {
-    if (csc->cmdPtr == cmd) {
-      csc->cmdPtr = NULL;
-    }
-  }
+  CallStackClearCmdReferences(interp, cmd);
   return Tcl_DeleteCommandFromToken(interp, cmd);
 }