Index: generic/nsfStack.c
===================================================================
diff -u -N -r23bf0a56d4e2d46a9581d3071f7836313c16ca64 -red88632709d9a9aa87619b5bc4d68e57d8b47d8d
--- generic/nsfStack.c	(.../nsfStack.c)	(revision 23bf0a56d4e2d46a9581d3071f7836313c16ca64)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision ed88632709d9a9aa87619b5bc4d68e57d8b47d8d)
@@ -109,7 +109,7 @@
   nonnull(2);
 #endif
 
-NSF_INLINE static void CscInit_(/*@notnull@*/ NsfCallStackContent *cscPtr, NsfObject *object, NsfClass *cl,
+NSF_INLINE static void CscInit_(/*@notnull@*/ NsfCallStackContent *cscPtr, NsfObject *object, NsfClass *class,
                                 Tcl_Command cmd, unsigned short frameType, unsigned int flags)
   nonnull(1) nonnull(2);
 
@@ -1188,7 +1188,7 @@
  *----------------------------------------------------------------------
  */
 NSF_INLINE static void
-CscInit_(/*@notnull@*/ NsfCallStackContent *cscPtr, NsfObject *object, NsfClass *cl,
+CscInit_(/*@notnull@*/ NsfCallStackContent *cscPtr, NsfObject *object, NsfClass *class,
         Tcl_Command cmd, unsigned short frameType, unsigned int flags) {
 #if defined(NSF_PROFILE)
   struct Tcl_Time trt;
@@ -1221,12 +1221,12 @@
     /*
      * Track class activations
      */
-    if (cl != NULL) {
+    if (class != NULL) {
       /*
        * handle class activation count
        */
-      cl->object.activationCount ++;
-      MEM_COUNT_ALLOC("class.activationCount", cl);
+      class->object.activationCount ++;
+      MEM_COUNT_ALLOC("class.activationCount", class);
       /*
        * Increment the namespace ptr in case Tcl tries to delete
        * this namespace during the invocation
@@ -1239,7 +1239,7 @@
   }
   cscPtr->flags        |= flags & NSF_CSC_COPY_FLAGS;
   cscPtr->self          = object;
-  cscPtr->cl            = cl;
+  cscPtr->cl            = class;
   cscPtr->cmdPtr        = cmd;
   cscPtr->objv          = NULL;
   cscPtr->filterStackEntry = object->filterStack;