diff --git a/src/cmp/cmpcall.lsp b/src/cmp/cmpcall.lsp
index 9a872c494..93db7bca3 100644
--- a/src/cmp/cmpcall.lsp
+++ b/src/cmp/cmpcall.lsp
@@ -21,14 +21,17 @@
   (or (cmp-env-search-macro name)
       (macro-function name)))
 
+(defun unoptimized-long-call (fun arguments)
+  (let ((frame (gensym)))
+    (c1expr `(with-stack ,frame
+	       ,@(loop for i in arguments collect `(stack-push ,i))
+	       (si::apply-from-stack-frame ,frame ,fim)))))
+
 (defun unoptimized-funcall (fun arguments)
   (let ((l (length arguments)))
     (if (<= l si::c-arguments-limit)
 	(make-c1form* 'FUNCALL :args (c1expr fun) (c1args* arguments))
-	(let ((frame (gensym)))
-	  (c1expr `(with-stack ,frame
-		     ,@(loop for i in arguments collect `(stack-push ,i))
-		     (si::apply-from-stack-frame ,frame ,fim)))))))
+	(unoptimized-long-call fun arguments))))
 
 (defun c1funcall (args)
   (check-args-number 'FUNCALL args 1)
diff --git a/src/cmp/cmpeval.lsp b/src/cmp/cmpeval.lsp
index 7f8e46654..d1774fe52 100644
--- a/src/cmp/cmpeval.lsp
+++ b/src/cmp/cmpeval.lsp
@@ -71,13 +71,8 @@
 (defun c1call-local (fname args)
   (let ((fun (local-function-ref fname)))
     (when fun
-      (let ((l (length args)))
-	(when (> l si::c-arguments-limit)
-	  (return-from c1call-local
-	    (let ((frame (gensym)))
-	      (c1expr `(with-stack ,frame
-			 ,@(loop for i in args collect `(stack-push ,i))
-			 (si::apply-from-stack-frame ,frame #',fname)))))))
+      (when (> (length args) si::c-arguments-limit)
+	(return-from c1call-local (unoptimized-long-call `#',fname args)))
       (let* ((forms (c1args* args))
 	     (lambda-form (fun-lambda fun))
 	     (return-type (or (get-local-return-type fun) 'T))
@@ -100,10 +95,7 @@
   (let ((l (length args))
 	forms)
     (cond ((> l si::c-arguments-limit)
-	   (c1expr (let ((frame (gensym)))
-		     `(with-stack ,frame
-			,@(loop for i in args collect `(stack-push ,frame ,i))
-			(si::apply-from-stack-frame ,frame #',fname)))))
+	   (unoptimized-long-call `#',fname args))
 	  ((maybe-optimize-structure-access fname args))
 	  #+clos
 	  ((maybe-optimize-generic-function fname args))