diff --git a/src/cmp/cmppass1-call.lsp b/src/cmp/cmppass1-call.lsp
index 55af6949a..39b0ebf45 100644
--- a/src/cmp/cmppass1-call.lsp
+++ b/src/cmp/cmppass1-call.lsp
@@ -244,10 +244,8 @@
                  (return
                    (let ((results (multiple-value-list (apply fname (nreverse all-values)))))
                      (if (endp (rest results))
-                         (c1constant-value (first results) :only-small-values nil)
-                         (let ((results (mapcar (lambda (r)
-                                                  (c1constant-value r :only-small-values nil))
-                                                results)))
+                         (c1constant-value (first results))
+                         (let ((results (mapcar #'c1constant-value results)))
                            (when (every #'identity results)
                              (make-c1form* 'values :args results)))))))
       (error (c) (cmpdebug "Can't constant-fold ~s ~s: ~a~%" fname forms c)))))
diff --git a/src/cmp/cmppass1-eval.lsp b/src/cmp/cmppass1-eval.lsp
index 3cc72ed2d..f795cca64 100644
--- a/src/cmp/cmppass1-eval.lsp
+++ b/src/cmp/cmppass1-eval.lsp
@@ -25,9 +25,8 @@
                ((keywordp form)
                 (make-c1form* 'LOCATION :type (object-type form)
                               :args (add-symbol form)))
-               ((constantp form *cmp-env*)
-                (or (c1constant-value (symbol-value form) :only-small-values t)
-                    (c1var form)))
+               ((and (constantp form *cmp-env*)
+                     (c1constant-value (symbol-value form))))
                (t (c1var form))))
         ((consp form)
          (cmpck (not (si:proper-list-p form))
@@ -117,7 +116,7 @@
        (return form))
      (setf form new-form))))
 
-(defun c1constant-value (val &key always only-small-values)
+(defun c1constant-value (val &key always)
   (cond
     ;; FIXME includes in c1 pass.
     ((ext:when-let ((x (assoc val *optimizable-constants*)))
@@ -146,7 +145,6 @@
     #+sse2
     ((typep val 'EXT:SSE-PACK)
      (c1constant-value/sse val))
-    (only-small-values nil)
     (always
      (make-c1form* 'LOCATION :type `(eql ,val)
                              :args (add-object val)))
diff --git a/src/cmp/cmptype.lsp b/src/cmp/cmptype.lsp
index 55132af6b..363133649 100644
--- a/src/cmp/cmptype.lsp
+++ b/src/cmp/cmptype.lsp
@@ -49,7 +49,7 @@
                                  (si:complex-single-float . #c(0.0l0 0.0l0)))
                                :test #'subtypep))))
     (if new-value
-        (c1constant-value new-value :only-small-values t)
+        (c1constant-value new-value)
         (c1nil))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;