diff --git a/pkgs/racket-test/tests/stxparse/test.rkt b/pkgs/racket-test/tests/stxparse/test.rkt
index 9a79da04ba..56ccc0495c 100644
--- a/pkgs/racket-test/tests/stxparse/test.rkt
+++ b/pkgs/racket-test/tests/stxparse/test.rkt
@@ -50,92 +50,92 @@
 (terx (1 (2 3)) (_:one _:two) "expected one")
 (terx ((1) 2) (_:one _:two) "expected two")
 
-(test-case "datum patterns"
-  (tok () ()
-       'ok
-       #:pre [(_) 0] #:post [])
-  (tok "here" "here"
-       'ok
-       #:pre ["there" #"here" 0] #:post [])
-  (tok #"byte" #"byte"
-       'ok
-       #:pre [#"other" "byte" 0] #:post [])
-  (tok 1 1
-       'ok)
-  (tok 1 _
-       #t
-       #:pre [2] #:post [])
-  (tok #f #f
-       'ok
-       #:pre [#t 0] #:post [_])
-  (tok #\c #\c
-       'ok
-       #:pre [#\d "c" 0] #:post [_])
-  (tok #:kw #:kw
-       'ok
-       #:pre [#:other {~datum kw} "kw" 0] #:post [_])
-  (tok #rx".*" #rx".*"
-       'ok
-       #:pre [#rx"." #px".*" #rx#".*" #px#".*"] #:post [_])
-  (tok #px".*" #px".*"
-       'ok
-       #:pre [#px"." #rx".*" #rx#".*" #px#".*"] #:post [_])
-  (tok #rx#".*" #rx#".*"
-       'ok
-       #:pre [#rx#"." #px#".*" #rx".*" #px".*"] #:post [_])
-  (tok #px#".*" #px#".*"
-       'ok
-       #:pre [#px#"." #rx#".*" #rx".*" #px".*"] #:post [_])
-  (tok #&"box" #&"box"
-       'ok
-       #:pre [#&"other" {~datum #&_} 0] #:post [_])
-  (tok #&_ #&_
-       'ok
-       #:pre [{~datum #&other}] #:post [_])
-  (tok #&xyz {~datum #&xyz}
-       'ok)
-  (tok xyz {~datum xyz}
-       'ok)
-  (tok (a . b) {~datum (a . b)}
-       'ok
-       #:pre [{~datum (_ . _)}] #:post [_])
-  (tok (a b c) {~datum (a b c)}
-       'ok
-       #:pre [{~datum (_ _ _)} {~datum (_ . _)}] #:post [_])
+;; datum patterns
+(tok () ()
+     'ok
+     #:pre [(_) 0] #:post [])
+(tok "here" "here"
+     'ok
+     #:pre ["there" #"here" 0] #:post [])
+(tok #"byte" #"byte"
+     'ok
+     #:pre [#"other" "byte" 0] #:post [])
+(tok 1 1
+     'ok)
+(tok 1 _
+     #t
+     #:pre [2] #:post [])
+(tok #f #f
+     'ok
+     #:pre [#t 0] #:post [_])
+(tok #\c #\c
+     'ok
+     #:pre [#\d "c" 0] #:post [_])
+(tok #:kw #:kw
+     'ok
+     #:pre [#:other {~datum kw} "kw" 0] #:post [_])
+(tok #rx".*" #rx".*"
+     'ok
+     #:pre [#rx"." #px".*" #rx#".*" #px#".*"] #:post [_])
+(tok #px".*" #px".*"
+     'ok
+     #:pre [#px"." #rx".*" #rx#".*" #px#".*"] #:post [_])
+(tok #rx#".*" #rx#".*"
+     'ok
+     #:pre [#rx#"." #px#".*" #rx".*" #px".*"] #:post [_])
+(tok #px#".*" #px#".*"
+     'ok
+     #:pre [#px#"." #rx#".*" #rx".*" #px".*"] #:post [_])
+(tok #&"box" #&"box"
+     'ok
+     #:pre [#&"other" {~datum #&_} 0] #:post [_])
+(tok #&_ #&_
+     'ok
+     #:pre [{~datum #&other}] #:post [_])
+(tok #&xyz {~datum #&xyz}
+     'ok)
+(tok xyz {~datum xyz}
+     'ok)
+(tok (a . b) {~datum (a . b)}
+     'ok
+     #:pre [{~datum (_ . _)}] #:post [_])
+(tok (a b c) {~datum (a b c)}
+     'ok
+     #:pre [{~datum (_ _ _)} {~datum (_ . _)}] #:post [_])
 
-  (tok #(1 2 3) {~datum #(1 2 3)}
-       'ok
-       #:pre [{~datum #(_ _ _)}] #:post [_])
-  (tok #hash([a . 1] [b . 2]) {~datum #hash([b . 2] [a . 1])}
-       'ok
-       #:pre [{~datum #hash([_ . 1] [_ . 2])}
-              {~datum #hash([a . _] [b . _])}
-              {~datum #hasheq([a . 1] [b . 2])}
-              {~datum #hasheqv([a . 1] [b . 2])}]
-       #:post [_])
-  (tok #hasheq([a . 1] [b . 2]) {~datum #hasheq([b . 2] [a . 1])}
-       'ok
-       #:pre [{~datum #hasheq([_ . 1] [_ . 2])}
-              {~datum #hasheq([a . _] [b . _])}
-              {~datum #hash([a . 1] [b . 2])}
-              {~datum #hasheqv([a . 1] [b . 2])}]
-       #:post [_])
-  (tok #hasheqv([a . 1] [b . 2]) {~datum #hasheqv([b . 2] [a . 1])}
-       'ok
-       #:pre [{~datum #hasheqv([_ . 1] [_ . 2])}
-              {~datum #hasheqv([a . _] [b . _])}
-              {~datum #hasheq([a . 1] [b . 2])}
-              {~datum #hash([a . 1] [b . 2])}]
-       #:post [_])
-  (tok #s(prefab-st x y z) {~datum #s(prefab-st x y z)}
-       'ok
-       #:pre [{~datum #s(prefab-st _ _ _)}] #:post [_])
-  (tok #s(prefab-st x y z) #s(prefab-st _ _ _)
-       'ok)
+(tok #(1 2 3) {~datum #(1 2 3)}
+     'ok
+     #:pre [{~datum #(_ _ _)}] #:post [_])
+(tok #hash([a . 1] [b . 2]) {~datum #hash([b . 2] [a . 1])}
+     'ok
+     #:pre [{~datum #hash([_ . 1] [_ . 2])}
+            {~datum #hash([a . _] [b . _])}
+            {~datum #hasheq([a . 1] [b . 2])}
+            {~datum #hasheqv([a . 1] [b . 2])}]
+     #:post [_])
+(tok #hasheq([a . 1] [b . 2]) {~datum #hasheq([b . 2] [a . 1])}
+     'ok
+     #:pre [{~datum #hasheq([_ . 1] [_ . 2])}
+            {~datum #hasheq([a . _] [b . _])}
+            {~datum #hash([a . 1] [b . 2])}
+            {~datum #hasheqv([a . 1] [b . 2])}]
+     #:post [_])
+(tok #hasheqv([a . 1] [b . 2]) {~datum #hasheqv([b . 2] [a . 1])}
+     'ok
+     #:pre [{~datum #hasheqv([_ . 1] [_ . 2])}
+            {~datum #hasheqv([a . _] [b . _])}
+            {~datum #hasheq([a . 1] [b . 2])}
+            {~datum #hash([a . 1] [b . 2])}]
+     #:post [_])
+(tok #s(prefab-st x y z) {~datum #s(prefab-st x y z)}
+     'ok
+     #:pre [{~datum #s(prefab-st _ _ _)}] #:post [_])
+(tok #s(prefab-st x y z) #s(prefab-st _ _ _)
+     'ok)
 
-  (terx 1 2 "literal 2")
-  (terx (1 2) 1 "literal 1")
-  (terx (1 2) (1 1) "literal 1"))
+(terx 1 2 "literal 2")
+(terx (1 2) 1 "literal 1")
+(terx (1 2) (1 1) "literal 1")
 
 ;; literal patterns
 (test-case "literals: +"
diff --git a/racket/collects/syntax/parse/experimental/template.rkt b/racket/collects/syntax/parse/experimental/template.rkt
index 4f0b2d3f74..926e5ab3fb 100644
--- a/racket/collects/syntax/parse/experimental/template.rkt
+++ b/racket/collects/syntax/parse/experimental/template.rkt
@@ -4,8 +4,7 @@
                      racket/syntax
                      syntax/parse/private/minimatch
                      racket/private/stx ;; syntax/stx
-                     racket/private/sc
-                     racket/struct)
+                     racket/private/sc)
          syntax/parse/private/residual
          "private/substitute.rkt")
 (provide template
@@ -410,7 +409,7 @@ instead of integers and integer vectors.
        (and (pair? v) (quotable? (car v)) (quotable? (cdr v)))
        (and (vector? v) (andmap quotable? (vector->list v)))
        (and (hash? v) (andmap quotable? (hash->list v)))
-       (and (prefab-struct-key v) (andmap quotable? (struct->list v)))))
+       (and (prefab-struct-key v) (andmap quotable? (cdr (vector->list (struct->vector v)))))))
 
  (define (cons-guide g1 g2)
    (if (and (eq? g1 '_) (eq? g2 '_)) '_ (cons g1 g2)))