diff --git a/src/cmp/cmpeval.lsp b/src/cmp/cmpeval.lsp
index 2c1426422..d46dd308e 100644
--- a/src/cmp/cmpeval.lsp
+++ b/src/cmp/cmpeval.lsp
@@ -115,20 +115,15 @@
                            ))))))
 
 (defun c2expr (form)
-  (let* ((*compile-file-truename* (c1form-file form))
-         (*compile-file-position* (c1form-file-position form))
-         (*current-toplevel-form* (c1form-toplevel-form form))
-         (*current-form* (c1form-form form))
-         (*current-c2form* form)
-         (*cmp-env* (c1form-env form))
-         (name (c1form-name form))
-         (args (c1form-args form))
-         (dispatch (get-sysprop name 'C2)))
-    (if (or (eq name 'LET) (eq name 'LET*))
-        (let ((*volatile* (c1form-volatile* form)))
-          (declare (special *volatile*))
-          (apply dispatch args))
-        (apply dispatch args))))
+  (with-c1form-env (form form)
+    (let* ((name (c1form-name form))
+           (args (c1form-args form))
+           (dispatch (get-sysprop name 'C2)))
+      (if (or (eq name 'LET) (eq name 'LET*))
+          (let ((*volatile* (c1form-volatile* form)))
+            (declare (special *volatile*))
+            (apply dispatch args))
+          (apply dispatch args)))))
 
 (defun c2expr* (form)
   (let* ((*exit* (next-label))
diff --git a/src/cmp/cmpform.lsp b/src/cmp/cmpform.lsp
index 4e35608df..c5d44d5d0 100644
--- a/src/cmp/cmpform.lsp
+++ b/src/cmp/cmpform.lsp
@@ -256,3 +256,12 @@
   (or (fourth (gethash (c1form-name form) +c1-form-hash+))
       (<= (nth-value 1 (c1form-values-number form)) 1)))
 
+(defmacro with-c1form-env ((form value) &rest body)
+  `(let* ((,form ,value)
+          (*compile-file-truename* (c1form-file ,form))
+          (*compile-file-position* (c1form-file-position ,form))
+          (*current-toplevel-form* (c1form-toplevel-form ,form))
+          (*current-form* (c1form-form ,form))
+          (*current-c2form* ,form)
+          (*cmp-env* (c1form-env ,form)))
+     ,@body))
diff --git a/src/cmp/cmpinline.lsp b/src/cmp/cmpinline.lsp
index c983ec54e..e00f2b1b0 100644
--- a/src/cmp/cmpinline.lsp
+++ b/src/cmp/cmpinline.lsp
@@ -63,7 +63,8 @@
   (let* ((fname (c1form-arg 0 form))
          (args (c1form-arg 1 form))
          (return-type (c1form-primary-type form))
-         (loc (call-global-loc fname nil args return-type expected-type))
+         (fun (find fname *global-funs* :key #'fun-name :test #'same-fname-p))
+         (loc (call-global-loc fname fun args return-type expected-type))
          (type (loc-type loc))
          (temp (make-inline-temp-var expected-type type
                                      (loc-representation-type loc)))
@@ -115,28 +116,29 @@
                     #+nil (c1form-arg 2 form))))))
 
 (defun emit-inline-form (form expected-type forms)
-  (case (c1form-name form)
-    (LOCATION
-     (list (c1form-primary-type form) (c1form-arg 0 form)))
-    (VAR
-     (emit-inlined-variable form expected-type forms))
-    (CALL-GLOBAL
-     (emit-inlined-call-global form expected-type))
-    (SYS:STRUCTURE-REF
-     (emit-inlined-structure-ref form expected-type forms))
-    #+clos
-    (SYS:INSTANCE-REF
-     (emit-inlined-instance-ref form expected-type forms))
-    (SETQ
-     (emit-inlined-setq form expected-type forms))
-    (PROGN
-     (emit-inlined-progn form expected-type forms))
-    (VALUES
-     (emit-inlined-values form expected-type forms))
-    (t (let* ((type (c1form-primary-type form))
-              (temp (make-inline-temp-var expected-type type)))
-         (let ((*destination* temp)) (c2expr* form))
-         (list type temp)))))
+  (with-c1form-env (form form)
+    (case (c1form-name form)
+      (LOCATION
+       (list (c1form-primary-type form) (c1form-arg 0 form)))
+      (VAR
+       (emit-inlined-variable form expected-type forms))
+      (CALL-GLOBAL
+       (emit-inlined-call-global form expected-type))
+      (SYS:STRUCTURE-REF
+       (emit-inlined-structure-ref form expected-type forms))
+      #+clos
+      (SYS:INSTANCE-REF
+       (emit-inlined-instance-ref form expected-type forms))
+      (SETQ
+       (emit-inlined-setq form expected-type forms))
+      (PROGN
+        (emit-inlined-progn form expected-type forms))
+      (VALUES
+       (emit-inlined-values form expected-type forms))
+      (t (let* ((type (c1form-primary-type form))
+                (temp (make-inline-temp-var expected-type type)))
+           (let ((*destination* temp)) (c2expr* form))
+           (list type temp))))))
 
 ;;;
 ;;; inline-args: