diff --git a/collects/typed-scheme/lang/reader.ss b/collects/typed-scheme/lang/reader.ss
index 27442278..554ba602 100644
--- a/collects/typed-scheme/lang/reader.ss
+++ b/collects/typed-scheme/lang/reader.ss
@@ -2,13 +2,12 @@
 (require (prefix-in r: "../typed-reader.ss")
          (only-in syntax/module-reader wrap-read-all))
 
-(define (*read in)
-  (wrap-read-all 'typed-scheme in r:read))
+(define (*read in modpath line col pos)
+  (wrap-read-all 'typed-scheme in r:read modpath #f line col pos))
 
-(define (*read-syntax src in)
-  (wrap-read-all 'typed-scheme
-                 in
-                 (lambda (in)
-                   (r:read-syntax src in))))
+(define (*read-syntax src in modpath line col pos)
+  (wrap-read-all
+   'typed-scheme in (lambda (in) (r:read-syntax src in))
+   modpath src line col pos))
 
 (provide (rename-out [*read read] [*read-syntax read-syntax]))
diff --git a/collects/typed-scheme/private/base-env.ss b/collects/typed-scheme/private/base-env.ss
index 5891dd3e..8c73784b 100644
--- a/collects/typed-scheme/private/base-env.ss
+++ b/collects/typed-scheme/private/base-env.ss
@@ -7,7 +7,7 @@
                        string-constants/string-constant
                        #;'#%more-scheme
                        #;'#%qq-and-or
-                       (lib "match-error.ss" "mzlib" "private" "match"))
+                       (only-in scheme/match/patterns match:error))
          )
 
 
@@ -20,7 +20,7 @@
  (only-in "type-effect-convenience.ss" [make-arr* make-arr])
  "union.ss"
  string-constants/string-constant
- (lib "match-error.ss" "mzlib" "private" "match")
+ (only-in scheme/match/patterns match:error)
  "tc-structs.ss")
 
 (require (for-syntax
@@ -32,7 +32,7 @@
           (only-in "type-effect-convenience.ss" [make-arr* make-arr])
           "union.ss"
           string-constants/string-constant
-          (lib "match-error.ss" "mzlib" "private" "match")
+          (only-in scheme/match/patterns match:error)
           "tc-structs.ss"))
 
 (define-for-syntax (initialize-others) 
diff --git a/collects/typed-scheme/private/subtype.ss b/collects/typed-scheme/private/subtype.ss
index 52342b29..71e515e2 100644
--- a/collects/typed-scheme/private/subtype.ss
+++ b/collects/typed-scheme/private/subtype.ss
@@ -99,7 +99,7 @@
     (match (list s t)
       ;; top for functions is above everything
       [(list _ (top-arr:)) A0]
-      [(list (arr: s1 s2 #f thn-eff els-eff) (arr: t1 t2 #f (or '() thn-eff) (or '() els-eff)))
+      [(list (arr: s1 s2 #f thn-eff els-eff) (arr: t1 t2 #f thn-eff  els-eff))
        (let ([A1 (subtypes* A0 t1 s1)])
          (subtype* A1 s2 t2))]
       [(list (arr: s1 s2 s3 thn-eff els-eff) (arr: t1 t2 t3 thn-eff* els-eff*))