diff --git a/collects/mzlib/private/package-helper.rkt b/collects/mzlib/private/package-helper.rkt
index e700f12..837f4df 100644
--- a/collects/mzlib/private/package-helper.rkt
+++ b/collects/mzlib/private/package-helper.rkt
@@ -46,7 +46,8 @@
      ((bound-identifier=? id (caar renames)) (car renames))
      (else (stx-assoc id (cdr renames)))))
   
-  (define insp (current-code-inspector))
+  (define insp (variable-reference->module-declaration-inspector
+                (#%variable-reference)))
 
   (define (rebuild ctxt val)
     (if (syntax? ctxt)
diff --git a/collects/mzlib/shared.rkt b/collects/mzlib/shared.rkt
index e1abe2b..995bc9f 100644
--- a/collects/mzlib/shared.rkt
+++ b/collects/mzlib/shared.rkt
@@ -9,7 +9,8 @@
 
 (provide shared)
 
-(define-for-syntax code-insp (current-code-inspector))
+(define-for-syntax code-insp (variable-reference->module-declaration-inspector
+                              (#%variable-reference)))
 
 (define undefined (letrec ([x x]) x))
 (require (only-in scheme/base [cons the-cons]))
diff --git a/collects/racket/package.rkt b/collects/racket/package.rkt
index 7d7aa42..e5f41e6 100644
--- a/collects/racket/package.rkt
+++ b/collects/racket/package.rkt
@@ -102,7 +102,8 @@
                  orig
                  orig))
 
-(define-for-syntax code-insp (current-code-inspector))
+(define-for-syntax code-insp (variable-reference->module-declaration-inspector
+                              (#%variable-reference)))
 (define-for-syntax (disarm* stx)
   (cond
    [(and (syntax? stx)