Index: generic/nsf.c
===================================================================
diff -u -N -rd5f0e46cd4b8ff19bb805ab0ea2eccead21be63f -r459516f92aed8b1287b3824d7dd39f58859dea4d
--- generic/nsf.c	(.../nsf.c)	(revision d5f0e46cd4b8ff19bb805ab0ea2eccead21be63f)
+++ generic/nsf.c	(.../nsf.c)	(revision 459516f92aed8b1287b3824d7dd39f58859dea4d)
@@ -88,6 +88,7 @@
 /*
  * Call Stack specific definitions
  */
+
 typedef enum { CALLING_LEVEL, ACTIVE_LEVEL } CallStackLevel;
 
 typedef struct callFrameContext {
@@ -1179,7 +1180,7 @@
 CallMethod(ClientData clientData, Tcl_Interp *interp, Tcl_Obj *methodObj,
            int objc, Tcl_Obj *const objv[], unsigned int flags) {
   NsfObject *object;
-  int result;
+  int        result;
   ALLOC_ON_STACK(Tcl_Obj*, objc, tov);
 
   nonnull_assert(clientData != NULL);
@@ -1203,6 +1204,7 @@
   result = ObjectDispatch(clientData, interp, objc, tov, flags);
 
   FREE_ON_STACK(Tcl_Obj*, tov);
+
   return result;
 }
 
@@ -1232,8 +1234,8 @@
 int
 NsfCallMethodWithArgs(Tcl_Interp *interp, Nsf_Object *object, Tcl_Obj *methodObj,
                       Tcl_Obj *arg1, int givenObjc, Tcl_Obj *const objv[], unsigned int flags) {
-  int objc = givenObjc + 2;
-  int result;
+  int       objc = givenObjc + 2;
+  int       result;
   ALLOC_ON_STACK(Tcl_Obj*, objc, tov);
 
   nonnull_assert(interp != NULL);
@@ -1256,6 +1258,7 @@
   result = ObjectDispatch(object, interp, objc, tov, flags);
 
   FREE_ON_STACK(Tcl_Obj*, tov);
+
   return result;
 }
 
@@ -1535,7 +1538,7 @@
           int objc, Tcl_Obj *const objv[]) {
   NsfClass *cl = (NsfClass *) class;
   int result;
-  ALLOC_ON_STACK(Tcl_Obj *, objc+2, ov);
+  ALLOC_ON_STACK(Tcl_Obj*, objc, tov);
 
   nonnull_assert(interp != NULL);
   nonnull_assert(class != NULL);
@@ -1544,14 +1547,14 @@
 
   INCR_REF_COUNT2("nameObj", nameObj);
 
-  ov[0] = NULL;
-  ov[1] = nameObj;
+  tov[0] = NULL;
+  tov[1] = nameObj;
   if (objc > 0) {
-    memcpy(ov+2, objv, sizeof(Tcl_Obj *) * (size_t)objc);
+    memcpy(tov+2, objv, sizeof(Tcl_Obj *) * (size_t)objc);
   }
-  result = NsfCCreateMethod(interp, cl, nameObj, objc+2, ov);
+  result = NsfCCreateMethod(interp, cl, nameObj, objc+2, tov);
 
-  FREE_ON_STACK(Tcl_Obj*, ov);
+  FREE_ON_STACK(Tcl_Obj*, tov);
   DECR_REF_COUNT2("nameObj", nameObj);
 
   return result;
Index: generic/nsfInt.h
===================================================================
diff -u -N -r1279a7ecae38bb092922db436da36d0caa77cf6f -r459516f92aed8b1287b3824d7dd39f58859dea4d
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 1279a7ecae38bb092922db436da36d0caa77cf6f)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 459516f92aed8b1287b3824d7dd39f58859dea4d)
@@ -311,7 +311,14 @@
 #  define USE_MALLOC
 #endif
 
-#if defined(__GNUC__) && !defined(USE_ALLOCA) && !defined(USE_MALLOC)
+#if 1
+# define NSF_STACK_ALLOCATED_OBJV 32
+# define ALLOC_ON_STACK(type,n,var) \
+  type *(var); type stack_allocated_##var[NSF_STACK_ALLOCATED_OBJV];	\
+  if (likely((n) < NSF_STACK_ALLOCATED_OBJV)) { (var) = &stack_allocated_##var[0]; } else { (var) = NEW_ARRAY(type, (n)); }
+# define FREE_ON_STACK(type, var) \
+  if ((var) != &stack_allocated_##var[0]) { FREE(type *, var);}
+#elif defined(__GNUC__) && !defined(USE_ALLOCA) && !defined(USE_MALLOC)
 # if !defined(NDEBUG)
 #  define ALLOC_ON_STACK(type,n,var) \
   int __##var##_count = (n); type __##var[(n)+2];			\