diff --git a/modules/ordo/action/filesystem.scm b/modules/ordo/action/filesystem.scm
index b27c2b8..2ed5548 100644
--- a/modules/ordo/action/filesystem.scm
+++ b/modules/ordo/action/filesystem.scm
@@ -11,28 +11,26 @@
             install-file))
 
 (define* (create-temporary-directory #:key tmpdir suffix template)
-  (lambda (conn ctx)
+  (lambda (conn)
     (connection-must conn "mktemp" (chain-when
                                     '("--directory")
                                     (tmpdir (append _ `("--tmpdir" tmpdir)))
                                     (suffix (append _ `("--suffix" suffix)))
-                                    (template (append _ `(template)))
-                                    (#t (resolve-context-refs ctx _))))))
+                                    (template (append _ `(template)))))))
 
 (define* (install-directory path #:key owner group mode)
-  (lambda (conn ctx)
+  (lambda (conn)
     (connection-must conn "install" (chain-when
                                      '("--directory")
                                      (owner (append _ `("--owner" ,owner)))
                                      (group (append _ `("--group" ,group)))
                                      (mode (append _ `("--mode" ,mode)))
-                                     (#t (append _ `(,path)))
-                                     (#t (resolve-context-refs ctx _))))))
+                                     (#t (append _ `(,path)))))))
 
 ;; Helper not intended for use outside of this module
-(define (upload-tmp-file conn ctx)
+(define (upload-tmp-file conn)
   (lambda (input-port)
-    (let ((tmp-path (car (connection-must conn "mktemp" `("-p" ,(context-scratch-dir ctx))))))
+    (let ((tmp-path (car (connection-must conn "mktemp"))))
       (connection-call-with-output-file conn tmp-path
                                         (lambda (output-port)
                                           (let loop ((data (get-bytevector-some input-port)))
@@ -47,12 +45,12 @@
 (define* (install-file path #:key owner group mode content local-src remote-src backup?)
   (when (not (= 1 (length (filter identity (list content local-src remote-src)))))
     (error "exactly one of #:content, #:local-src, or #:remote-src is required"))
-  (lambda (conn ctx)
+  (lambda (conn)
     (let ((remote-src (cond
                        (remote-src remote-src)
-                       (local-src (call-with-input-file local-src (upload-tmp-file conn ctx)))
-                       ((string? content) (call-with-input-string content (upload-tmp-file conn ctx)))
-                       ((bytevector? content) (call-with-input-bytevector content (upload-tmp-file conn ctx)))
+                       (local-src (call-with-input-file local-src (upload-tmp-file conn)))
+                       ((string? content) (call-with-input-string content (upload-tmp-file conn)))
+                       ((bytevector? content) (call-with-input-bytevector content (upload-tmp-file conn)))
                        (else (error "unsupported type for #:content")))))
       (connection-must conn "install" (chain-when
                                        '()
@@ -60,5 +58,4 @@
                                        (group (append _ `("--group" ,group)))
                                        (mode (append _ `("--mode" ,mode)))
                                        (backup? (append _ '("--backup" "numbered")))
-                                       (#t (append _ (list remote-src path)))
-                                       (#t (resolve-context-refs ctx _)))))))
+                                       (#t (append _ (list remote-src path))))))))
diff --git a/modules/ordo/context.scm b/modules/ordo/context.scm
index 4c5f155..3172394 100644
--- a/modules/ordo/context.scm
+++ b/modules/ordo/context.scm
@@ -9,8 +9,6 @@
             get-context-triggers
             context-triggered?
             register-context-var!
-            context-ref
-            resolve-context-ref
             resolve-context-refs))
 
 (define-record-type <context>
@@ -23,18 +21,13 @@
 (define* (context #:key scratch-dir init-vars)
   (make-context scratch-dir init-vars))
 
-(define-record-type <context-ref>
-  (context-ref name)
-  context-ref?
-  (name var-name))
-
-(define (resolve-context-ref ctx v)
-  (if (context-ref? v)
-      (assoc-ref (context-vars ctx) (var-name v))
-      v))
-
-(define (resolve-context-refs ctx args)
-  (map (cut resolve-context-ref ctx <>) args))
+(define-syntax resolve-context-refs
+  (syntax-rules ($)
+    ((_ ctx ($ x))
+     (assoc-ref (context-vars ctx) x))
+    ((_ ctx (f x ...))
+     (f (resolve-context-refs ctx x) ...))
+    ((_ ctx x) x)))
 
 (define (add-context-triggers! ctx triggers)
   (when triggers
diff --git a/modules/ordo/task.scm b/modules/ordo/task.scm
index 60c3619..1c97fa2 100644
--- a/modules/ordo/task.scm
+++ b/modules/ordo/task.scm
@@ -29,7 +29,7 @@
      (task%
       description
       (lambda (conn ctx)
-        (action conn ctx (assoc-ref ctx arg) ...))
+        (action conn (resolve-context-refs ctx arg) ...))
       kwarg ...))))
 
 (define (run-task conn ctx task)