diff --git a/syndicate/pattern.rkt b/syndicate/pattern.rkt
index 6c315da..0845472 100644
--- a/syndicate/pattern.rkt
+++ b/syndicate/pattern.rkt
@@ -113,13 +113,12 @@
       [(list* k v more) (append (f k v) (append-map-pairs f more))]))
 
   (define (analyse-pattern stx
-                           [check-destructuring (lambda (stx) stx)]
-                           [wrap-literal (lambda (stx) stx)])
+                           #:check-destructuring [check-destructuring (lambda (stx) stx)]
+                           #:wrap-literal [wrap-literal (lambda (stx) stx)])
     (define (walk-hash pieces-stx)
-      (append-map-pairs (lambda (key-stx pat-stx)
-                          (list key-stx (analyse-pattern pat-stx check-destructuring wrap-literal)))
+      (append-map-pairs (lambda (key-stx pat-stx) (list key-stx (walk pat-stx)))
                         (syntax->list pieces-stx)))
-    (let walk ((stx stx))
+    (define (walk stx)
       (define disarmed-stx (syntax-disarm stx orig-insp))
       (syntax-case disarmed-stx ($ quasiquote unquote quote)
         [expander
@@ -181,7 +180,8 @@
               (hash-or-hasheqv-id? #'hash-stx))
          #`(dict* (hash-stx #,@(walk-hash #'(piece ...))))]
 
-        [other #`(literal->literal-pattern #,(wrap-literal #'other))])))
+        [other #`(literal->literal-pattern #,(wrap-literal #'other))]))
+    (walk stx))
 
   (define (analyse-pattern-bindings stx)
     (let walk ((stx stx))
@@ -294,7 +294,9 @@
     (syntax-case stx ()
       [(_ pat-stx atomic-literal-transformer)
        (analyse-pattern #'pat-stx
+                        #:check-destructuring
                         (lambda (stx) (raise-syntax-error #f "Attempt to destructure known-atomic"))
+                        #:wrap-literal
                         (lambda (stx) #`(atomic-literal-transformer #,stx)))]
       [(_ pat-stx)
        (analyse-pattern #'pat-stx)])))