diff --git a/8-0/racket/collects/syntax/parse/private/parse.rkt b/8-0/racket/collects/syntax/parse/private/parse.rkt
index 7e5c61d..e14cc3a 100644
--- a/8-0/racket/collects/syntax/parse/private/parse.rkt
+++ b/8-0/racket/collects/syntax/parse/private/parse.rkt
@@ -435,12 +435,7 @@ Conventions:
                         ((body-sequence)
                          (syntax-case rest ()
                            [(e0 e ...)
-                            ;; Should we use a shadower (works on the whole file, unhygienically),
-                            ;; or use the context of the syntax-parse identifier?
-                            (let ([the-#%intdef-begin (datum->syntax #'ctx '#%intdef-begin)])
-                              (if (syntax-local-value the-#%intdef-begin (λ () #f)) ;; Defined as a macro
-                                  #`(let () (#,the-#%intdef-begin e0 e ...))
-                                  #'(let () e0 e ...)))]
+                            #'(let () e0 e ...)]
                            [_ (raise-syntax-error #f "expected non-empty clause body"
                                                   #'ctx clause)]))
                         (else
diff --git a/8-0/racket/collects/syntax/parse/private/residual.rkt b/8-0/racket/collects/syntax/parse/private/residual.rkt
index 1c78afe..75f1453 100644
--- a/8-0/racket/collects/syntax/parse/private/residual.rkt
+++ b/8-0/racket/collects/syntax/parse/private/residual.rkt
@@ -10,7 +10,7 @@
 (require (for-syntax racket/private/sc syntax/parse/private/residual-ct))
 (provide (for-syntax (all-from-out syntax/parse/private/residual-ct)))
 
-(require "../../case/template.rkt")
+(require racket/private/template)
 (provide (for-syntax attribute-mapping attribute-mapping?))
 
 ;; ============================================================
@@ -18,9 +18,7 @@
 
 (require "runtime-progress.rkt"
          "3d-stx.rkt"
-         auto-syntax-e
-         syntax/stx
-         stxparse-info/current-pvars)
+         syntax/stx)
 
 (provide (all-from-out "runtime-progress.rkt")
 
diff --git a/8-0/racket/collects/syntax/parse/private/runtime.rkt b/8-0/racket/collects/syntax/parse/private/runtime.rkt
index 90d7ea8..41b3214 100644
--- a/8-0/racket/collects/syntax/parse/private/runtime.rkt
+++ b/8-0/racket/collects/syntax/parse/private/runtime.rkt
@@ -1,13 +1,11 @@
 #lang racket/base
 (require racket/stxparam
          stxparse-info/parse/private/residual ;; keep abs. path
-         stxparse-info/current-pvars
          (for-syntax racket/base
                      racket/list
                      syntax/kerncase
                      syntax/strip-context
                      racket/private/sc
-                     auto-syntax-e/utils
                      racket/syntax
                      syntax/parse/private/rep-data))
 
@@ -113,10 +111,9 @@ residual.rkt.
                 ...)
                ([(vtmp) value] ...)
              (letrec-syntaxes+values
-                 ([(name) (make-auto-pvar 'depth (quote-syntax stmp))] ...)
+                 ([(name) (make-syntax-mapping 'depth (quote-syntax stmp))] ...)
                  ()
-               (with-pvars (name ...)
-                 . body)))))]))
+               . body))))]))
 
 ;; (let-attributes* (([id num] ...) (expr ...)) expr) : expr
 ;; Special case: empty attrs need not match number of value exprs.
@@ -150,9 +147,8 @@ residual.rkt.
                     (attribute-mapping (quote-syntax vtmp) 'name 'depth
                                        (if 'syntax? #f (quote-syntax check-attr-value))))
                   ...
-                  (define-syntax name (make-auto-pvar 'depth (quote-syntax stmp)))
-                  ...
-                  (define-pvars name ...))))]))
+                  (define-syntax name (make-syntax-mapping 'depth (quote-syntax stmp)))
+                  ...)))]))
 
 (define-syntax-rule (phase-of-enclosing-module)
   (variable-reference->module-base-phase