Index: generic/nsfStack.c
===================================================================
diff -u -N -rf1549882987594cfc9d4f61ce1c8a4ee5b529bf1 -rfd0a160a7d611803da5ff128b7776935ae9d1461
--- generic/nsfStack.c	(.../nsfStack.c)	(revision f1549882987594cfc9d4f61ce1c8a4ee5b529bf1)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision fd0a160a7d611803da5ff128b7776935ae9d1461)
@@ -795,14 +795,12 @@
 
 static Tcl_CallFrame *
 CallStackNextFrameOfType(Tcl_CallFrame *framePtr, unsigned int flags) {
-  NsfCallStackContent *cscPtr;
 
   nonnull_assert(framePtr != NULL);
 
   do {
+    NsfCallStackContent *cscPtr = Tcl_CallFrame_clientData(framePtr);
 
-    cscPtr = Tcl_CallFrame_clientData(framePtr);
-
     if (cscPtr != NULL && (cscPtr->frameType & NSF_CSC_TYPE_ENSEMBLE) != 0u) {
       (void)CallStackFindEnsembleCsc(framePtr, &framePtr);
     }