Index: generic/nsf.c
===================================================================
diff -u -N -rf4077b427aade0dc3e4c6c1218df736b66ec6c7f -ra6e4b1ad5d61bd76e911cfac041c2b9fa7194c7d
--- generic/nsf.c	(.../nsf.c)	(revision f4077b427aade0dc3e4c6c1218df736b66ec6c7f)
+++ generic/nsf.c	(.../nsf.c)	(revision a6e4b1ad5d61bd76e911cfac041c2b9fa7194c7d)
@@ -15587,11 +15587,8 @@
   }
 
 
-  /* TODO: Is this guarding too excessive, or just fine? */
   methodObjTypePtr = methodObj->typePtr;
-  if (methodObjTypePtr == Nsf_OT_tclCmdNameType
-      || methodObjTypePtr == &NsfInstanceMethodObjType
-      || methodObjTypePtr == &NsfObjectMethodObjType) {
+  if (methodObjTypePtr == Nsf_OT_tclCmdNameType) {
     ccCtxPtr = methodObj->internalRep.twoPtrValue.ptr2;
   } else {
     ccCtxPtr = NULL;