diff --git a/collects/typed-scheme/lang/minimal.ss b/collects/typed-scheme/lang/minimal.ss
index c732931f44..7c9b94e051 100644
--- a/collects/typed-scheme/lang/minimal.ss
+++ b/collects/typed-scheme/lang/minimal.ss
@@ -26,4 +26,3 @@
              (provide (rename-out [b* b] ...))
              (provide (all-from-out ts))
              (provide (all-from-out lb) ...))))))]))
-	
\ No newline at end of file
diff --git a/collects/typed-scheme/lang/reader.ss b/collects/typed-scheme/lang/reader.ss
index 8794ba5907..27caa224ec 100644
--- a/collects/typed-scheme/lang/reader.ss
+++ b/collects/typed-scheme/lang/reader.ss
@@ -12,4 +12,3 @@
 		     (r:read-syntax src in))))
   
   (provide (rename-out [*read read] [*read-syntax read-syntax])))
-
diff --git a/collects/typed-scheme/private/check-subforms-unit.ss b/collects/typed-scheme/private/check-subforms-unit.ss
index 79298be97c..3e6439a002 100644
--- a/collects/typed-scheme/private/check-subforms-unit.ss
+++ b/collects/typed-scheme/private/check-subforms-unit.ss
@@ -107,4 +107,4 @@
       [(a . b)
        (loop #'a)
        (loop #'b)]
-      [_ (void)])))
\ No newline at end of file
+      [_ (void)])))
diff --git a/collects/typed-scheme/private/def-binding.ss b/collects/typed-scheme/private/def-binding.ss
index 41d3136105..a7314d9aec 100644
--- a/collects/typed-scheme/private/def-binding.ss
+++ b/collects/typed-scheme/private/def-binding.ss
@@ -7,4 +7,4 @@
 
 (define-struct binding (name) #:inspector #f)
 (define-struct (def-binding binding) (ty) #:inspector #f)
-(define-struct (def-stx-binding binding) () #:inspector #f)
\ No newline at end of file
+(define-struct (def-stx-binding binding) () #:inspector #f)
diff --git a/collects/typed-scheme/private/defstruct-unit.ss b/collects/typed-scheme/private/defstruct-unit.ss
index fa4e6b29de..64924c5987 100644
--- a/collects/typed-scheme/private/defstruct-unit.ss
+++ b/collects/typed-scheme/private/defstruct-unit.ss
@@ -19,4 +19,4 @@
            (define-struct/properties nm1 (flds1 ...) props #f)
            (define-struct (nm par) (flds ...) #f) ...))]))
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/extra-procs.ss b/collects/typed-scheme/private/extra-procs.ss
index cd8af3b267..bd7722be80 100644
--- a/collects/typed-scheme/private/extra-procs.ss
+++ b/collects/typed-scheme/private/extra-procs.ss
@@ -6,4 +6,4 @@
       (error "Assertion failed - value was #f"))
     v)
 
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/free-variance.ss b/collects/typed-scheme/private/free-variance.ss
index 8bf8664d06..ffc5e74af6 100644
--- a/collects/typed-scheme/private/free-variance.ss
+++ b/collects/typed-scheme/private/free-variance.ss
@@ -95,4 +95,4 @@
   (syntax-case stx ()
     [(_ table val . body)
      (quasisyntax/loc stx
-       (hash-table-get table val #,(syntax/loc #'body (lambda () . body))))]))
\ No newline at end of file
+       (hash-table-get table val #,(syntax/loc #'body (lambda () . body))))]))
diff --git a/collects/typed-scheme/private/infer.ss b/collects/typed-scheme/private/infer.ss
index c1f1c6f407..ff3f36878c 100644
--- a/collects/typed-scheme/private/infer.ss
+++ b/collects/typed-scheme/private/infer.ss
@@ -404,7 +404,3 @@
 (define infer/list (mk-infer infer/int/list))
 
 ;(trace infer infer/int/list infer/int infer/list)
-
-
-
-
diff --git a/collects/typed-scheme/private/init-envs.ss b/collects/typed-scheme/private/init-envs.ss
index 957efd1ae0..4f3075c51b 100644
--- a/collects/typed-scheme/private/init-envs.ss
+++ b/collects/typed-scheme/private/init-envs.ss
@@ -73,6 +73,4 @@
 
 
 
-
-
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/internal-forms.ss b/collects/typed-scheme/private/internal-forms.ss
index b1808af506..e816236447 100644
--- a/collects/typed-scheme/private/internal-forms.ss
+++ b/collects/typed-scheme/private/internal-forms.ss
@@ -12,4 +12,4 @@
                   define-typed-struct/exec-internal
                   assert-predicate-internal
                   :-internal)
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/interning.ss b/collects/typed-scheme/private/interning.ss
index 130a46a874..5d86462d9a 100644
--- a/collects/typed-scheme/private/interning.ss
+++ b/collects/typed-scheme/private/interning.ss
@@ -47,4 +47,4 @@
    id 
    (lambda () (let ([c (id-count!)])
                 (module-identifier-mapping-put! identifier-table id c)
-                c))))
\ No newline at end of file
+                c))))
diff --git a/collects/typed-scheme/private/lexical-env.ss b/collects/typed-scheme/private/lexical-env.ss
index ffea848ebb..8fa5a1f282 100644
--- a/collects/typed-scheme/private/lexical-env.ss
+++ b/collects/typed-scheme/private/lexical-env.ss
@@ -48,4 +48,4 @@
       [(_ f i . b)
        (with-lexical-env (update-type/lexical f i) . b)]))
 
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/mutated-vars.ss b/collects/typed-scheme/private/mutated-vars.ss
index b55ce41c3e..3b3778f40b 100644
--- a/collects/typed-scheme/private/mutated-vars.ss
+++ b/collects/typed-scheme/private/mutated-vars.ss
@@ -49,4 +49,4 @@
   
   (provide find-mutated-vars is-var-mutated?)
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/parse-type.ss b/collects/typed-scheme/private/parse-type.ss
index f4e16dd98e..8bd050d5b4 100644
--- a/collects/typed-scheme/private/parse-type.ss
+++ b/collects/typed-scheme/private/parse-type.ss
@@ -207,4 +207,3 @@
            (string? (syntax-e #'t)))
        (-val (syntax-e #'t))]
       [_ (tc-error "not a valid type: ~a" (syntax->datum stx))])))
-
diff --git a/collects/typed-scheme/private/planet-requires.ss b/collects/typed-scheme/private/planet-requires.ss
index 0c21dc6017..3e46e27dea 100644
--- a/collects/typed-scheme/private/planet-requires.ss
+++ b/collects/typed-scheme/private/planet-requires.ss
@@ -46,4 +46,4 @@
                    "util.ss")
   (planet/multiple ("cce" "fasttest.plt" 1 2)
                    "random.ss"
-                   "schemeunit.ss"))
\ No newline at end of file
+                   "schemeunit.ss"))
diff --git a/collects/typed-scheme/private/prims.ss b/collects/typed-scheme/private/prims.ss
index 29bb988ab1..45452b4f0b 100644
--- a/collects/typed-scheme/private/prims.ss
+++ b/collects/typed-scheme/private/prims.ss
@@ -331,5 +331,3 @@ This file defines two sorts of primitives. All of them are provided into any mod
                       (begin e1 e2 ...)
                       (begin c ... (doloop step ...)))))]))]))
 
-
-
diff --git a/collects/typed-scheme/private/provide-handling.ss b/collects/typed-scheme/private/provide-handling.ss
index e9fcc99e75..b52d2da209 100644
--- a/collects/typed-scheme/private/provide-handling.ss
+++ b/collects/typed-scheme/private/provide-handling.ss
@@ -106,4 +106,4 @@
              (tc-error "provide: protect not supported by Typed Scheme")]
             [_ (int-err "unknown provide form")])))
       (syntax->list #'(form ...)))]
-    [_ (int-err "non-provide form! ~a" (syntax->datum form))]))
\ No newline at end of file
+    [_ (int-err "non-provide form! ~a" (syntax->datum form))]))
diff --git a/collects/typed-scheme/private/remove-intersect.ss b/collects/typed-scheme/private/remove-intersect.ss
index 6765e21574..4ad904313b 100644
--- a/collects/typed-scheme/private/remove-intersect.ss
+++ b/collects/typed-scheme/private/remove-intersect.ss
@@ -92,5 +92,3 @@
 
 ;(trace *remove)
 ;(trace restrict)
-
-
diff --git a/collects/typed-scheme/private/rep-utils.ss b/collects/typed-scheme/private/rep-utils.ss
index 19939a6358..fe4348fb20 100644
--- a/collects/typed-scheme/private/rep-utils.ss
+++ b/collects/typed-scheme/private/rep-utils.ss
@@ -158,7 +158,3 @@
                    frees)))])))
     (values (mk #'Type #'type-name-ht) (mk #'Effect #'effect-name-ht))))
 
-
-
-
-
diff --git a/collects/typed-scheme/private/resolve-type.ss b/collects/typed-scheme/private/resolve-type.ss
index b07bf88d92..28385b8097 100644
--- a/collects/typed-scheme/private/resolve-type.ss
+++ b/collects/typed-scheme/private/resolve-type.ss
@@ -76,4 +76,4 @@
 
 ;(trace resolve-type)
 
-|#
\ No newline at end of file
+|#
diff --git a/collects/typed-scheme/private/signatures.ss b/collects/typed-scheme/private/signatures.ss
index 19812bf322..a0052243f3 100644
--- a/collects/typed-scheme/private/signatures.ss
+++ b/collects/typed-scheme/private/signatures.ss
@@ -39,4 +39,4 @@
   (define-signature tc-let^
     (tc/let-values tc/letrec-values tc/let-values/check tc/letrec-values/check))
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/subtype.ss b/collects/typed-scheme/private/subtype.ss
index dcda390b32..52342b291f 100644
--- a/collects/typed-scheme/private/subtype.ss
+++ b/collects/typed-scheme/private/subtype.ss
@@ -268,5 +268,3 @@
 
 ;(subtype (-> Univ B) (-> Univ Univ))
 ;(subtype (make-poly '(a) (make-tvar 'a)) (make-lst N))
-
-
diff --git a/collects/typed-scheme/private/tables.ss b/collects/typed-scheme/private/tables.ss
index 6d52dd436e..1437ced3ac 100644
--- a/collects/typed-scheme/private/tables.ss
+++ b/collects/typed-scheme/private/tables.ss
@@ -38,5 +38,3 @@
 
 (define (insert k v t)
   (cons (cons k v) t))
-
-
diff --git a/collects/typed-scheme/private/tc-expr-unit.ss b/collects/typed-scheme/private/tc-expr-unit.ss
index 528d6513a8..31e9d2761c 100644
--- a/collects/typed-scheme/private/tc-expr-unit.ss
+++ b/collects/typed-scheme/private/tc-expr-unit.ss
@@ -311,4 +311,4 @@
   (cond [(null? exprs) (check-below (ret -Void) expected)]
         [(null? (cdr exprs)) (tc-expr/check (car exprs) expected)]
         [else (tc-expr/check (car exprs) Univ)
-              (tc-exprs/check (cdr exprs) expected)]))
\ No newline at end of file
+              (tc-exprs/check (cdr exprs) expected)]))
diff --git a/collects/typed-scheme/private/tc-if-unit.ss b/collects/typed-scheme/private/tc-if-unit.ss
index cf9064803a..967307269e 100644
--- a/collects/typed-scheme/private/tc-if-unit.ss
+++ b/collects/typed-scheme/private/tc-if-unit.ss
@@ -221,5 +221,4 @@
          (ret t))])))
 
 
-
-;)
\ No newline at end of file
+;)
diff --git a/collects/typed-scheme/private/tc-structs.ss b/collects/typed-scheme/private/tc-structs.ss
index 8237507ddd..e38751c88d 100644
--- a/collects/typed-scheme/private/tc-structs.ss
+++ b/collects/typed-scheme/private/tc-structs.ss
@@ -249,4 +249,4 @@
 
 
 
-|#
\ No newline at end of file
+|#
diff --git a/collects/typed-scheme/private/tc-toplevel.ss b/collects/typed-scheme/private/tc-toplevel.ss
index 496df7905b..032eeeb728 100644
--- a/collects/typed-scheme/private/tc-toplevel.ss
+++ b/collects/typed-scheme/private/tc-toplevel.ss
@@ -241,5 +241,3 @@
   (tc-toplevel/pass1 form)  
   (tc-toplevel/pass2 form))
 
-
-
diff --git a/collects/typed-scheme/private/tc-utils.ss b/collects/typed-scheme/private/tc-utils.ss
index 9b60c143af..7ead0a6279 100644
--- a/collects/typed-scheme/private/tc-utils.ss
+++ b/collects/typed-scheme/private/tc-utils.ss
@@ -85,4 +85,4 @@
   (define (add-type-name-reference t)
     (type-name-references (cons t (type-name-references))))
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/tool.ss b/collects/typed-scheme/private/tool.ss
index 4071ff7f19..dc2e24020a 100644
--- a/collects/typed-scheme/private/tool.ss
+++ b/collects/typed-scheme/private/tool.ss
@@ -47,8 +47,3 @@
 		       ((drscheme:language:get-default-mixin) 
 			mbl%)))))))
   )
-      
-      
-  
-  
-  
diff --git a/collects/typed-scheme/private/type-comparison.ss b/collects/typed-scheme/private/type-comparison.ss
index b421fd8625..f0530faa44 100644
--- a/collects/typed-scheme/private/type-comparison.ss
+++ b/collects/typed-scheme/private/type-comparison.ss
@@ -5,4 +5,4 @@
   
   
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/type-effect-convenience.ss b/collects/typed-scheme/private/type-effect-convenience.ss
index d12f0cbd58..898768d938 100644
--- a/collects/typed-scheme/private/type-effect-convenience.ss
+++ b/collects/typed-scheme/private/type-effect-convenience.ss
@@ -228,4 +228,4 @@
           [_ (exit t)]))))
 
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/type-effect-printer.ss b/collects/typed-scheme/private/type-effect-printer.ss
index 9424048944..c43c07e4be 100644
--- a/collects/typed-scheme/private/type-effect-printer.ss
+++ b/collects/typed-scheme/private/type-effect-printer.ss
@@ -142,4 +142,4 @@
   (set-box! print-type* print-type)
   (set-box! print-effect* print-effect)
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/type-environments.ss b/collects/typed-scheme/private/type-environments.ss
index 54d5b008b2..6d3ffbe81f 100644
--- a/collects/typed-scheme/private/type-environments.ss
+++ b/collects/typed-scheme/private/type-environments.ss
@@ -57,4 +57,4 @@
                    [else (extend-env (list ks) (list vs) env)]))
            env kss vss))
 
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/type-name-env.ss b/collects/typed-scheme/private/type-name-env.ss
index 3031f28ada..5ebaa8dde1 100644
--- a/collects/typed-scheme/private/type-name-env.ss
+++ b/collects/typed-scheme/private/type-name-env.ss
@@ -40,5 +40,3 @@
 ;; (id type -> T) -> listof[T]
 (define (type-name-env-map f)
   (module-identifier-mapping-map the-mapping f))
-
-
diff --git a/collects/typed-scheme/private/type-rep.ss b/collects/typed-scheme/private/type-rep.ss
index 0c7c274930..b4feb3dc7a 100644
--- a/collects/typed-scheme/private/type-rep.ss
+++ b/collects/typed-scheme/private/type-rep.ss
@@ -430,5 +430,4 @@
                [Poly-body* Poly-body]))
   
   ;(trace unfold)
-  
-  
\ No newline at end of file
+
diff --git a/collects/typed-scheme/private/type-utils.ss b/collects/typed-scheme/private/type-utils.ss
index edfc6dc833..6053562fd9 100644
--- a/collects/typed-scheme/private/type-utils.ss
+++ b/collects/typed-scheme/private/type-utils.ss
@@ -75,4 +75,4 @@
 (define (fv t) (hash-table-map (free-vars* t) (lambda (k v) k)))
 
 ;; fv/list : Listof[Type] -> Listof[Name]
-(define (fv/list ts) (hash-table-map (combine-frees (map free-vars* ts)) (lambda (k v) k)))  
+(define (fv/list ts) (hash-table-map (combine-frees (map free-vars* ts)) (lambda (k v) k)))
diff --git a/collects/typed-scheme/private/union.ss b/collects/typed-scheme/private/union.ss
index a58d59fb75..517ad1415e 100644
--- a/collects/typed-scheme/private/union.ss
+++ b/collects/typed-scheme/private/union.ss
@@ -59,4 +59,4 @@
   ;(trace u-maker)
   (set-union-maker! u-maker)
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/unit-utils.ss b/collects/typed-scheme/private/unit-utils.ss
index 60b37a2a21..891ccc6497 100644
--- a/collects/typed-scheme/private/unit-utils.ss
+++ b/collects/typed-scheme/private/unit-utils.ss
@@ -90,4 +90,4 @@
     
   (define-values/link-units/infer (export x^) x@ y@)
   
-  )
\ No newline at end of file
+  )
diff --git a/collects/typed-scheme/private/utils.ss b/collects/typed-scheme/private/utils.ss
index 01a9317d61..1d3275c9a7 100644
--- a/collects/typed-scheme/private/utils.ss
+++ b/collects/typed-scheme/private/utils.ss
@@ -117,5 +117,3 @@
           [(symbol? v) (symbol->string v)]
           [(identifier? v) (symbol->string (syntax-e v))]))
   (datum->syntax kw (string->symbol (apply string-append (map f args)))))
-
-
diff --git a/collects/typed-scheme/typed-scheme.ss b/collects/typed-scheme/typed-scheme.ss
index 4a85636203..baac75e0dc 100644
--- a/collects/typed-scheme/typed-scheme.ss
+++ b/collects/typed-scheme/typed-scheme.ss
@@ -23,8 +23,7 @@
           "private/type-contract.ss"
           "private/nest.ss"
           syntax/kerncase
-          mzlib/list
-          mzlib/plt-match))
+          scheme/match))
 
 
 (provide