diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/in-bytes.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/in-bytes.rkt
index 49cf42c33d..b4f8a48d53 100644
--- a/collects/tests/typed-scheme/optimizer/hand-optimized/in-bytes.rkt
+++ b/collects/tests/typed-scheme/optimizer/hand-optimized/in-bytes.rkt
@@ -14,7 +14,7 @@
                         (lambda (x y) #t)))))
   (void)
   ((letrec-values (((for-loop)
-                    (#%plain-lambda
+                    (lambda
                      (fold-var pos)
                      (if (pos-cont? pos)
                          (let-values (((i) (pos->vals pos)))
diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/in-list.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/in-list.rkt
index 817a270d06..68051f185a 100644
--- a/collects/tests/typed-scheme/optimizer/hand-optimized/in-list.rkt
+++ b/collects/tests/typed-scheme/optimizer/hand-optimized/in-list.rkt
@@ -11,7 +11,7 @@
                           (lambda (x y) #t)))))
     (void)
     ((letrec-values (((for-loop)
-                      (#%plain-lambda
+                      (lambda
                           (fold-var pos)
                         (if (pos-cont? pos)
                             (let-values (((i) (pos->vals pos)))
diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/in-string.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/in-string.rkt
index 3c68cac9b4..c00609e23f 100644
--- a/collects/tests/typed-scheme/optimizer/hand-optimized/in-string.rkt
+++ b/collects/tests/typed-scheme/optimizer/hand-optimized/in-string.rkt
@@ -14,7 +14,7 @@
                         (lambda (x y) #t)))))
   (void)
   ((letrec-values (((for-loop)
-                    (#%plain-lambda
+                    (lambda
                      (fold-var pos)
                      (if (pos-cont? pos)
                          (let-values (((i) (pos->vals pos)))
diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/in-vector.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/in-vector.rkt
index 419f6c95ee..f922731666 100644
--- a/collects/tests/typed-scheme/optimizer/hand-optimized/in-vector.rkt
+++ b/collects/tests/typed-scheme/optimizer/hand-optimized/in-vector.rkt
@@ -14,7 +14,7 @@
                         (lambda (x y) #t)))))
   (void)
   ((letrec-values (((for-loop)
-                    (#%plain-lambda
+                    (lambda
                      (fold-var pos)
                      (if (pos-cont? pos)
                          (let-values (((i) (pos->vals pos)))
diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-binary-nonzero-fixnum.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-binary-nonzero-fixnum.rkt
index 2b094b1b7b..cadce81877 100644
--- a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-binary-nonzero-fixnum.rkt
+++ b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-binary-nonzero-fixnum.rkt
@@ -1,4 +1,4 @@
 (module invalid-binary-nonzero-fixnum typed/scheme
   (: f ( -> Void))
   (define f ; in a function, to prevent evaluation
-    (#%plain-lambda () (display (quotient 4 0))))) ; 2 fixnums, but the second is 0, cannot optimize
+    (lambda () (display (quotient 4 0))))) ; 2 fixnums, but the second is 0, cannot optimize
diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-mpair.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-mpair.rkt
index 59f4ff4e76..9419fb9efe 100644
--- a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-mpair.rkt
+++ b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-mpair.rkt
@@ -1,4 +1,4 @@
 #lang typed/scheme
 (: f ((MListof Integer) -> Integer))
 (define f
-  (#%plain-lambda (x) (mcar x)))
+  (lambda (x) (mcar x)))
diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-ref.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-ref.rkt
index 94efc33b99..90be4d891d 100644
--- a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-ref.rkt
+++ b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-ref.rkt
@@ -1,4 +1,4 @@
 (module invalid-vector-ref typed/scheme
   (: f ((Vectorof Integer) -> Integer))
   (define f
-    (#%plain-lambda (x) (vector-ref x 0)))) ; type is (Vectorof Integer), length is unknown, can't optimize
+    (lambda (x) (vector-ref x 0)))) ; type is (Vectorof Integer), length is unknown, can't optimize
diff --git a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-set.rkt b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-set.rkt
index 3fbd72d0b8..6b544a6064 100644
--- a/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-set.rkt
+++ b/collects/tests/typed-scheme/optimizer/hand-optimized/invalid-vector-set.rkt
@@ -1,4 +1,4 @@
 (module invalid-vector-set typed/scheme
   (: f ((Vectorof Integer) -> Void))
   (define f
-    (#%plain-lambda (x) (vector-set! x 0 2)))) ; type is (Vectorof Integer), length is ot known, can't optimize
+    (lambda (x) (vector-set! x 0 2)))) ; type is (Vectorof Integer), length is not known, can't optimize
diff --git a/collects/typed-scheme/optimizer/optimizer.rkt b/collects/typed-scheme/optimizer/optimizer.rkt
index c0f3c08b06..5f6f6c4961 100644
--- a/collects/typed-scheme/optimizer/optimizer.rkt
+++ b/collects/typed-scheme/optimizer/optimizer.rkt
@@ -35,10 +35,9 @@
   (pattern e:dead-code-opt-expr       #:with opt #'e.opt)
   
   ;; boring cases, just recur down
-  (pattern (#%plain-lambda formals e:opt-expr ...)
-           #:with opt #'(#%plain-lambda formals e.opt ...))
-  (pattern (define-values formals e:opt-expr ...)
-           #:with opt #'(define-values formals e.opt ...))
+  (pattern ((~and op (~or (~literal #%plain-lambda) (~literal define-values)))
+            formals e:opt-expr ...)
+           #:with opt #'(op formals e.opt ...))
   (pattern (case-lambda [formals e:opt-expr ...] ...)
            #:with opt #'(case-lambda [formals e.opt ...] ...))
   (pattern (let-values ([ids e-rhs:opt-expr] ...) e-body:opt-expr ...)