diff --git a/collects/syntax/boundmap.rkt b/collects/syntax/boundmap.rkt
index c779a36c91..2b40cf9711 100644
--- a/collects/syntax/boundmap.rkt
+++ b/collects/syntax/boundmap.rkt
@@ -1,8 +1,8 @@
 
 (module boundmap mzscheme
-  (require mzlib/contract
-	   "private/boundmap.rkt")
-
+  (require racket/contract
+           "private/boundmap.rkt")
+  
   (define-syntax provide/contract*
     (syntax-rules ()
       [(_ [(name0 name ...) contract])
@@ -26,11 +26,10 @@
 	(provide/contract*
 	 [make-identifier-mapping (-> identifier-mapping?)]
 	 [identifier-mapping?/out (any/c . -> . boolean?)]
-	 [identifier-mapping-get (opt->*
-				  (identifier-mapping?
-				   identifier?)
-				  ((-> any))
-				  any)]
+         [identifier-mapping-get (->* (identifier-mapping?
+                                       identifier?)
+                                      ((-> any))
+                                      any)]
 	 [identifier-mapping-put! (identifier-mapping?
 				   identifier?
 				   any/c
diff --git a/collects/syntax/modcode.rkt b/collects/syntax/modcode.rkt
index 5d354af9af..1b25b9a0bd 100644
--- a/collects/syntax/modcode.rkt
+++ b/collects/syntax/modcode.rkt
@@ -1,24 +1,29 @@
 (module modcode scheme/base
   (require mzlib/port
-           mzlib/contract
+           racket/contract
            "modread.ss")
 
   (provide moddep-current-open-input-file
            exn:get-module-code
            exn:get-module-code?
            exn:get-module-code-path
-           make-exn:get-module-code
-           get-module-code)
-  #;
-  ;; Contracts don't yet play well with keyword arguments:
+           make-exn:get-module-code)
+
   (provide/contract
-   [get-module-code ([path-string?]
-                     [(and/c path-string? relative-path?)
-                      (any/c . -> . any)
-                      (or/c false/c (path? boolean? . -> . any))
-		      any/c]
-                     . opt-> .
-                     any)])
+   [get-module-code (->* ((or/c path? module-path?))
+                         (#:sub-path 
+                          (and/c path-string? relative-path?)
+                          (and/c path-string? relative-path?)
+                          #:compile (-> any/c any)
+                          (-> any/c any)
+                          #:extension-handler (or/c false/c (path? boolean? . -> . any))
+                          (or/c false/c (path? boolean? . -> . any))
+                          #:choose 
+                          (path? path? path? . -> . (or/c (symbols 'src 'zo 'so) false/c))
+                          #:notify  (any/c . -> . any)
+                          #:source-reader (any/c input-port? . -> . syntax?)
+                          #:rkt-try-ss? boolean?)
+                         any)])
 
   (define moddep-current-open-input-file
     (make-parameter open-input-file))
diff --git a/collects/wxme/wxme.rkt b/collects/wxme/wxme.rkt
index 97f110c0dd..0183c46f00 100644
--- a/collects/wxme/wxme.rkt
+++ b/collects/wxme/wxme.rkt
@@ -4,7 +4,7 @@
            mzlib/string
            mzlib/kw
            mzlib/class
-           mzlib/contract
+           racket/contract
            mzlib/list
            scheme/gui/dynamic
            syntax/modread
@@ -707,8 +707,8 @@
         (values null null)))
 
   (provide/contract [is-wxme-stream? (input-port? . -> . any)]
-                    [wxme-port->text-port ((input-port?) (any/c) . opt-> . input-port?)]
-                    [wxme-port->port ((input-port?) (any/c (any/c . -> . any)) . opt-> . input-port?)]
+                    [wxme-port->text-port (->* (input-port?) (any/c) input-port?)]
+                    [wxme-port->port (->* (input-port?) (any/c (any/c . -> . any)) input-port?)]
                     [register-lib-mapping! (string? string? . -> . void?)]
                     [string->lib-path (string? any/c . -> . any)]
                     [extract-used-classes (input-port? . -> . any)])
diff --git a/collects/xml/text-box-tool.rkt b/collects/xml/text-box-tool.rkt
index 2a2f0ac2c8..b9c08e8479 100644
--- a/collects/xml/text-box-tool.rkt
+++ b/collects/xml/text-box-tool.rkt
@@ -5,7 +5,6 @@
            "text-snipclass.rkt"
            mzlib/unit
            mzlib/class
-	   mzlib/contract
            string-constants
            mrlib/include-bitmap)
   
@@ -35,4 +34,4 @@
       
       (drscheme:get/extend:extend-unit-frame text-box-mixin)
       
-      (drscheme:language:register-capability 'drscheme:special:insert-text-box (flat-contract boolean?) #t))))
+      (drscheme:language:register-capability 'drscheme:special:insert-text-box boolean? #t))))