@@ -2769,11 +2769,12 @@
          (restore-thunks
           (filter
            identity
            (map (lambda (env-pair)
                   (let* ((env-var     (car env-pair))
-                         (new-val     (cadr env-pair))
+                         (new-val     (let ((tmp (cdr env-pair)))
+                                        (if (list? tmp) (car tmp) tmp)))
                          (current-val (get-environment-variable env-var))
                          (restore-thunk
                           (cond
                            ((not current-val) (lambda () (unsetenv env-var)))
                            ((not (string? new-val)) #f)