diff --git a/collects/s-exp/lang/reader.ss b/collects/s-exp/lang/reader.ss
index f89321f4e1..88cd4f66e0 100644
--- a/collects/s-exp/lang/reader.ss
+++ b/collects/s-exp/lang/reader.ss
@@ -5,4 +5,4 @@
     (let* ([mod* (rd in)]
            [mod  (if stx? (syntax->list mod*) mod*)]
            [mod  `(,(car mod) ,(cadr mod) ,@(cdddr mod))])
-      (if stx? (datum->syntax mod* mod) mod))))
+      (if stx? (datum->syntax mod* mod mod*) mod))))
diff --git a/collects/syntax/module-reader.ss b/collects/syntax/module-reader.ss
index 200296745e..10aae4dff3 100644
--- a/collects/syntax/module-reader.ss
+++ b/collects/syntax/module-reader.ss
@@ -74,6 +74,12 @@
          [body (cond [(not wrapper) (body)]
                      [(procedure-arity-includes? wrapper 2) (wrapper body stx?)]
                      [else (wrapper body)])]
+         [all-loc (vector src line col pos
+                          (let-values ([(l c p) (port-next-location port)])
+                            (and p (- p pos))))]
+         [body (if (and stx? (not (syntax? body)))
+                 (datum->syntax #f body all-loc)
+                 body)]
          [p-name (object-name port)]
          [name (if (path? p-name)
                  (let-values ([(base name dir?) (split-path p-name)])
@@ -89,7 +95,7 @@
                       v))]
          [lib (if stx? (datum->syntax #f lib modpath modpath) lib)]
          [r `(,(tag-src 'module) ,(tag-src name) ,lib . ,body)])
-    (if stx? (datum->syntax #f r) r)))
+    (if stx? (datum->syntax #f r all-loc) r)))
 
 (define (wrap lib port read modpath src line col pos)
   (wrap-internal lib port read #f #f #f modpath src line col pos))
diff --git a/collects/typed-scheme/no-check/lang/reader.ss b/collects/typed-scheme/no-check/lang/reader.ss
index c35cbecc78..ad228622bc 100644
--- a/collects/typed-scheme/no-check/lang/reader.ss
+++ b/collects/typed-scheme/no-check/lang/reader.ss
@@ -1,13 +1,8 @@
-#lang scheme/base
-(require (prefix-in r: "../../typed-reader.ss")
-         (only-in syntax/module-reader wrap-read-all))
+#lang s-exp syntax/module-reader
 
-(define (*read in modpath line col pos)
-  (wrap-read-all 'typed-scheme/no-check in r:read modpath #f line col pos))
+typed-scheme/no-check
 
-(define (*read-syntax src in modpath line col pos)
-  (wrap-read-all
-   'typed-scheme/no-check in (lambda (in) (r:read-syntax src in))
-   modpath src line col pos))
+#:read r:read
+#:read-syntax r:read-syntax
 
-(provide (rename-out [*read read] [*read-syntax read-syntax]))
+(require (prefix-in r: "../typed-reader.ss"))