diff --git a/pollen/private/reader-base.rkt b/pollen/private/reader-base.rkt
index 5771f38..42a0d93 100644
--- a/pollen/private/reader-base.rkt
+++ b/pollen/private/reader-base.rkt
@@ -45,7 +45,15 @@
                   [DOC (setup:main-export)]
                   [META-MOD (setup:meta-export)]
                   [PARSER-MODE-FROM-READER parser-mode-from-reader]
-                  [POLLEN-MODULE-SYNTAX (let ([mod-stx #'(module POLLEN-MOD-NAME pollen
+                  [EXPANDER (cond
+                              [(eq? parser-mode-from-reader default-mode-markup) 'pollen/markup]
+                              [(eq? parser-mode-from-reader default-mode-markdown) 'pollen/markdown]
+                              [(eq? parser-mode-from-reader default-mode-pagetree) 'pollen/ptree]
+                              [(eq? parser-mode-from-reader default-mode-preproc) 'pollen/pre]
+                              [(eq? parser-mode-from-reader default-mode-auto) 'pollen]
+                              [(eq? parser-mode-from-reader default-mode-template) 'pollen/template]
+                              [else 'pollen])]
+                  [POLLEN-MODULE-SYNTAX (let ([mod-stx #'(module POLLEN-MOD-NAME EXPANDER
                                                            (define-meta HERE-KEY HERE-PATH)
                                                            POLLEN-REQUIRE-AND-PROVIDES
                                                            . SOURCE-LINES)])
diff --git a/pollen/private/ts.rktd b/pollen/private/ts.rktd
index 40ba235..18adc72 100644
--- a/pollen/private/ts.rktd
+++ b/pollen/private/ts.rktd
@@ -1 +1 @@
-1519582841
+1519828616