diff --git a/collects/mzlib/string.ss b/collects/mzlib/string.ss
index e764e51..32841c1 100644
--- a/collects/mzlib/string.ss
+++ b/collects/mzlib/string.ss
@@ -8,7 +8,7 @@
                  regexp-match-peek-positions*
                  regexp-split
                  regexp-match-exact?
-                 regexp-match/fail-without-reading)
+                 regexp-try-match)
            "kw.ss")
 
   (provide string-lowercase!
@@ -17,7 +17,8 @@
            read-from-string
            read-from-string-all
            expr->string
-           (all-from scheme/base)
+           (all-from-except scheme/base regexp-try-match)
+           (rename regexp-try-match regexp-match/fail-without-reading)
            glob->regexp)
 
 
diff --git a/collects/tests/mzscheme/pconvert.ss b/collects/tests/mzscheme/pconvert.ss
index bcea9b7..2e970bb 100644
--- a/collects/tests/mzscheme/pconvert.ss
+++ b/collects/tests/mzscheme/pconvert.ss
@@ -11,7 +11,7 @@
 (quasi-read-style-printing #f)
 
 (define (xl) 1)
-(define (xc) (class object% () (sequence (super-init))))
+(define (xc) (class object% (sequence (super-init))))
 
 (let ()
   (define-struct pctest (value constructor-sexp
@@ -183,8 +183,8 @@
                        xl-ID-BETTER-NOT-BE-DEFINED)
                      '(lambda () ...))
      (make-same-test xc 'xc)
-     (make-same-test (letrec ([xc (class object% ())]) xc) '(class ...))
-     (make-same-test (letrec ([xc-ID-BETTER-NOT-BE-DEFINED (class object% ())]) 
+     (make-same-test (letrec ([xc (class object%)]) xc) '(class ...))
+     (make-same-test (letrec ([xc-ID-BETTER-NOT-BE-DEFINED (class object%)]) 
                        xc-ID-BETTER-NOT-BE-DEFINED)
                      '(class ...))
      (make-same-test (lambda (x) x) '(lambda (a1) ...))
@@ -212,7 +212,7 @@
                        (hash-table-put! ht 'x 1)
                        ht)
                      '(hash-table ('x 1)))
-     (make-pctest (list 'a (box (list ())) (cons 1 '()))
+     (make-pctest (list 'a (box (list '())) (cons 1 '()))
                   '(list (quote a) (box (list empty)) (list 1))
                   '(list (quote a) (box (list empty)) (list 1))
                   '(list (quote a) (box (list empty)) (list 1))
@@ -346,7 +346,7 @@
   (test-not-shared 'x ''x)
   (test-shared (lambda (x) x) '(lambda (a1) ...))
   (test-shared (delay 1) '(delay ...))
-  (test-shared (class object% ()) '(class ...))
+  (test-shared (class object%) '(class ...))
   (test-shared (new (class object% (super-new))) '(instantiate (class ...) ...))
   
   (test-shared "abc" "abc")
diff --git a/collects/tests/mzscheme/unit.ss b/collects/tests/mzscheme/unit.ss
index e997409..7358951 100644
--- a/collects/tests/mzscheme/unit.ss
+++ b/collects/tests/mzscheme/unit.ss
@@ -417,7 +417,7 @@
 (test #t unit? (unit 
 		 (import x)
 		 (export)
-		 (class object% ()
+		 (class object%
 		   (field
 		     [x 10])
 		   (set! x 5))))