diff --git a/collects/compiler/decompile.rkt b/collects/compiler/decompile.rkt
index f6831c0900..ca9b60c7a5 100644
--- a/collects/compiler/decompile.rkt
+++ b/collects/compiler/decompile.rkt
@@ -259,7 +259,9 @@
     [(struct toplevel (depth pos const? ready?))
      (decompile-tl expr globs stack closed #f)]
     [(struct varref (tl dummy))
-     `(#%variable-reference ,(decompile-tl tl globs stack closed #t))]
+     `(#%variable-reference ,(if (eq? tl #t)
+                                 '<constant-local>
+                                 (decompile-tl tl globs stack closed #t)))]
     [(struct topsyntax (depth pos midpt))
      (list-ref/protect (glob-desc-vars globs) (+ midpt pos) 'topsyntax)]
     [(struct primval (id))
diff --git a/collects/compiler/zo-structs.rkt b/collects/compiler/zo-structs.rkt
index e7223113ff..86c8052a15 100644
--- a/collects/compiler/zo-structs.rkt
+++ b/collects/compiler/zo-structs.rkt
@@ -156,7 +156,7 @@
                                            [body (or/c expr? seq? any/c)])) ; `with-continuation-mark'
 (define-form-struct (beg0 expr) ([seq (listof (or/c expr? seq? any/c))])) ; `begin0'
 (define-form-struct (splice form) ([forms (listof (or/c form? any/c))])) ; top-level `begin'
-(define-form-struct (varref expr) ([toplevel toplevel?] [dummy toplevel?])) ; `#%variable-reference'
+(define-form-struct (varref expr) ([toplevel (or/c toplevel? #t)] [dummy (or/c toplevel? #f)])) ; `#%variable-reference'
 (define-form-struct (assign expr) ([id toplevel?] [rhs (or/c expr? seq? any/c)] [undef-ok? boolean?])) ; top-level or module-level set!
 (define-form-struct (apply-values expr) ([proc (or/c expr? seq? any/c)] [args-expr (or/c expr? seq? any/c)])) ; `(call-with-values (lambda () ,args-expr) ,proc)
 (define-form-struct (primval expr) ([id exact-nonnegative-integer?])) ; direct preference to a kernel primitive