diff --git a/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt b/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt
index 5acdeb0b18..a1c19804d8 100644
--- a/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt
+++ b/collects/tests/typed-scheme/unit-tests/type-annotation-test.rkt
@@ -17,7 +17,7 @@
                                                  [ns (make-base-namespace)])
                                              (parameterize ([current-namespace ns])
                                                (namespace-require 'typed-scheme/private/prims)
-                                               (namespace-require 'typed-scheme/private/base-types)
+                                               (namespace-require 'typed-scheme/private/base-types-new)
                                                (namespace-require 'typed-scheme/private/base-types-extra)
                                                (expand 'ann-stx))))
                           ty))
@@ -26,7 +26,7 @@
   (test-suite 
    "Type Annotation tests"
    ;; FIXME - ask Ryan
-   ;(tat (ann foo : Number) (ret -Number))
+   (tat (ann foo : Number) (ret -Number))
    (tat foo #f)
    (tat (ann foo : 3) (ret (-val 3) (make-NoFilter) (make-NoObject)))))
 
diff --git a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt
index 75a4d03601..f46fb27d31 100644
--- a/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt
+++ b/collects/tests/typed-scheme/unit-tests/typecheck-tests.rkt
@@ -62,7 +62,6 @@
     [(_ e)
      #`(parameterize ([delay-errors? #f]
                       [current-namespace (namespace-anchor->namespace anch)]
-                      [custom-printer #f]
                       [orig-module-stx (quote-syntax e)])
          (let ([ex (expand 'e)])
            (find-mutated-vars ex)
@@ -73,7 +72,6 @@
     [(_ e)
      #`(parameterize ([delay-errors? #f]
                       [current-namespace (namespace-anchor->namespace anch)]
-                      [custom-printer #f]
                       [orig-module-stx (quote-syntax e)])
          (let ([ex (expand 'e)])
            (find-mutated-vars ex)
diff --git a/collects/typed-scheme/private/prims.rkt b/collects/typed-scheme/private/prims.rkt
index 71c632d711..e2582ca6b0 100644
--- a/collects/typed-scheme/private/prims.rkt
+++ b/collects/typed-scheme/private/prims.rkt
@@ -48,7 +48,7 @@ This file defines two sorts of primitives. All of them are provided into any mod
          (except-in mzlib/contract ->)
          (only-in mzlib/contract [-> c->])
          mzlib/struct
-         "base-types.rkt"
+         "base-types-new.rkt"
          "base-types-extra.rkt")
 
 (define-for-syntax (ignore stx) (syntax-property stx 'typechecker:ignore #t))
diff --git a/collects/typed-scheme/private/with-types.rkt b/collects/typed-scheme/private/with-types.rkt
index 52b506a54a..29d30b1064 100644
--- a/collects/typed-scheme/private/with-types.rkt
+++ b/collects/typed-scheme/private/with-types.rkt
@@ -8,7 +8,6 @@
 	 "base-env-indexing-old.rkt"
 	 "extra-procs.rkt"
          "prims.rkt"
-         "base-types.rkt"
          racket/contract/regions racket/contract/base
          (for-syntax 
           "base-types-extra.rkt"
diff --git a/collects/typed-scheme/typed-scheme.rkt b/collects/typed-scheme/typed-scheme.rkt
index 1ffb4a199b..615cc6b489 100644
--- a/collects/typed-scheme/typed-scheme.rkt
+++ b/collects/typed-scheme/typed-scheme.rkt
@@ -2,7 +2,7 @@
 
 (require (rename-in "utils/utils.rkt" [infer r:infer]))
 
-(require (private base-types with-types)
+(require (private with-types)
          (for-syntax 
           (except-in syntax/parse id)
           scheme/base