diff --git a/collects/meta/props b/collects/meta/props
index 71d616cb52..a572485568 100755
--- a/collects/meta/props
+++ b/collects/meta/props
@@ -1154,9 +1154,6 @@ path/s is either such a string or a list of them.
 "collects/racket/match" responsible (samth)
 "collects/racket/match.rkt" responsible (samth)
 "collects/racklog" responsible (jay)
-"collects/raco" responsible (mflatt)
-"collects/raco/main.rkt" drdr:command-line #f
-"collects/raco/raco.rkt" drdr:command-line #f
 "collects/rackunit" responsible (jay noel ryanc)
 "collects/rackunit/gui.rkt" responsible (ryanc) drdr:command-line (gracket-text "-t" *)
 "collects/rackunit/private/gui" responsible (ryanc)
@@ -1167,6 +1164,9 @@ path/s is either such a string or a list of them.
 "collects/rackunit/private/gui/rml.rkt" drdr:command-line (gracket-text "-t" *)
 "collects/rackunit/private/gui/view.rkt" drdr:command-line (gracket-text "-t" *)
 "collects/rackunit/tool.rkt" responsible (ryanc) drdr:command-line (gracket-text "-t" *)
+"collects/raco" responsible (mflatt)
+"collects/raco/main.rkt" drdr:command-line #f
+"collects/raco/raco.rkt" drdr:command-line #f
 "collects/reader" responsible (mflatt)
 "collects/readline" responsible (mflatt)
 "collects/redex" responsible (clklein)
@@ -1470,31 +1470,93 @@ path/s is either such a string or a list of them.
 "collects/tests/racket/beginner.rktl" drdr:command-line (racket "-f" *)
 "collects/tests/racket/benchmarks/common/auto.rkt" drdr:command-line (racket * "--" "racket" "ctak")
 "collects/tests/racket/benchmarks/common/conform.rkt" drdr:command-line #f
+"collects/tests/racket/benchmarks/common/cpstack-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/cpstack-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/cpstack-typed.rktl" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/ctak-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/ctak-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/ctak-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/ctak.rkt" drdr:command-line #f
+"collects/tests/racket/benchmarks/common/dderiv-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/dderiv-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/dderiv-typed.rktl" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/deriv-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/deriv-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/deriv-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/destruct.rkt" drdr:command-line #f
+"collects/tests/racket/benchmarks/common/div-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/div-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/div-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/div.rkt" drdr:command-line (mzc *)
 "collects/tests/racket/benchmarks/common/dynamic.rkt" drdr:command-line #f
 "collects/tests/racket/benchmarks/common/dynamic2.rkt" drdr:command-line (mzc *)
+"collects/tests/racket/benchmarks/common/fft-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/fft-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/fft-typed.rktl" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/graphs-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/graphs-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/graphs-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/graphs.rkt" drdr:command-line (mzc *)
 "collects/tests/racket/benchmarks/common/lattice.rkt" drdr:command-line #f
+"collects/tests/racket/benchmarks/common/lattice2-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/lattice2-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/lattice2-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/maze.rkt" drdr:command-line #f
 "collects/tests/racket/benchmarks/common/maze2.rkt" drdr:command-line (mzc *)
+"collects/tests/racket/benchmarks/common/mazefun-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/mazefun-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/mazefun-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/mazefun.rkt" drdr:command-line (mzc *)
 "collects/tests/racket/benchmarks/common/mk-bigloo.rktl" drdr:command-line #f
 "collects/tests/racket/benchmarks/common/mk-chicken.rktl" drdr:command-line #f
 "collects/tests/racket/benchmarks/common/mk-gambit.rktl" drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nestedloop-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nestedloop-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nestedloop-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/nestedloop.rkt" drdr:command-line (mzc *)
+"collects/tests/racket/benchmarks/common/nfa-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nfa-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nfa-typed.rktl" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nothing-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nothing-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nothing-typed.rktl" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nqueens-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nqueens-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/nqueens-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/nqueens.rkt" drdr:command-line (mzc *)
+"collects/tests/racket/benchmarks/common/paraffins-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/paraffins-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/paraffins-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/paraffins.rkt" drdr:command-line (mzc *)
 "collects/tests/racket/benchmarks/common/peval.rkt" drdr:command-line #f
+"collects/tests/racket/benchmarks/common/puzzle-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/puzzle-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/puzzle-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/r5rs-wrap.rktl" drdr:command-line (racket "-f" *)
 "collects/tests/racket/benchmarks/common/scheme.rkt" drdr:command-line #f
 "collects/tests/racket/benchmarks/common/scheme2.rkt" drdr:command-line (mzc *)
 "collects/tests/racket/benchmarks/common/sort1.rkt" drdr:command-line #f
+"collects/tests/racket/benchmarks/common/tak-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/tak-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/tak-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/tak.rkt" drdr:command-line (mzc *)
+"collects/tests/racket/benchmarks/common/takl-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/takl-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/takl-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/takl.rkt" drdr:command-line (mzc *)
+"collects/tests/racket/benchmarks/common/takr-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/takr-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/takr-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/takr.rkt" drdr:command-line (mzc *)
+"collects/tests/racket/benchmarks/common/takr2-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/takr2-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/takr2-typed.rktl" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/common/takr2.rkt" drdr:command-line (mzc *)
+"collects/tests/racket/benchmarks/common/triangle-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/triangle-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/triangle-typed.rktl" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/wrap-typed-non-optimizing.rkt" responsible (stamourv) drdr:command-line #f
+"collects/tests/racket/benchmarks/common/wrap-typed-optimizing.rkt" responsible (stamourv) drdr:command-line #f
 "collects/tests/racket/benchmarks/mz/expand-class.rktl" drdr:command-line (racket "-f" *)
 "collects/tests/racket/benchmarks/mz/parsing.rktl" drdr:command-line (gracket "-f" *)
 "collects/tests/racket/benchmarks/mz/redsem.rktl" drdr:command-line (racket "-f" * "--" "--skip-struct-test")
diff --git a/collects/tests/racket/benchmarks/common/cpstack-typed.rkt b/collects/tests/racket/benchmarks/common/cpstack-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/cpstack-typed.rkt
rename to collects/tests/racket/benchmarks/common/cpstack-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/ctak-typed.rkt b/collects/tests/racket/benchmarks/common/ctak-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/ctak-typed.rkt
rename to collects/tests/racket/benchmarks/common/ctak-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/dderiv-typed.rkt b/collects/tests/racket/benchmarks/common/dderiv-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/dderiv-typed.rkt
rename to collects/tests/racket/benchmarks/common/dderiv-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/deriv-typed.rkt b/collects/tests/racket/benchmarks/common/deriv-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/deriv-typed.rkt
rename to collects/tests/racket/benchmarks/common/deriv-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/div-typed.rkt b/collects/tests/racket/benchmarks/common/div-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/div-typed.rkt
rename to collects/tests/racket/benchmarks/common/div-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/fft-typed.rkt b/collects/tests/racket/benchmarks/common/fft-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/fft-typed.rkt
rename to collects/tests/racket/benchmarks/common/fft-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/graphs-typed.rkt b/collects/tests/racket/benchmarks/common/graphs-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/graphs-typed.rkt
rename to collects/tests/racket/benchmarks/common/graphs-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/lattice2-typed.rkt b/collects/tests/racket/benchmarks/common/lattice2-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/lattice2-typed.rkt
rename to collects/tests/racket/benchmarks/common/lattice2-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/mazefun-typed.rkt b/collects/tests/racket/benchmarks/common/mazefun-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/mazefun-typed.rkt
rename to collects/tests/racket/benchmarks/common/mazefun-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/nestedloop-typed.rkt b/collects/tests/racket/benchmarks/common/nestedloop-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/nestedloop-typed.rkt
rename to collects/tests/racket/benchmarks/common/nestedloop-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/nfa-typed.rkt b/collects/tests/racket/benchmarks/common/nfa-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/nfa-typed.rkt
rename to collects/tests/racket/benchmarks/common/nfa-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/nothing-typed.rkt b/collects/tests/racket/benchmarks/common/nothing-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/nothing-typed.rkt
rename to collects/tests/racket/benchmarks/common/nothing-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/nqueens-typed.rkt b/collects/tests/racket/benchmarks/common/nqueens-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/nqueens-typed.rkt
rename to collects/tests/racket/benchmarks/common/nqueens-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/paraffins-typed.rkt b/collects/tests/racket/benchmarks/common/paraffins-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/paraffins-typed.rkt
rename to collects/tests/racket/benchmarks/common/paraffins-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/puzzle-typed.rkt b/collects/tests/racket/benchmarks/common/puzzle-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/puzzle-typed.rkt
rename to collects/tests/racket/benchmarks/common/puzzle-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/tak-typed.rkt b/collects/tests/racket/benchmarks/common/tak-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/tak-typed.rkt
rename to collects/tests/racket/benchmarks/common/tak-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/takl-typed.rkt b/collects/tests/racket/benchmarks/common/takl-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/takl-typed.rkt
rename to collects/tests/racket/benchmarks/common/takl-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/takr-typed.rkt b/collects/tests/racket/benchmarks/common/takr-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/takr-typed.rkt
rename to collects/tests/racket/benchmarks/common/takr-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/takr2-typed.rkt b/collects/tests/racket/benchmarks/common/takr2-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/takr2-typed.rkt
rename to collects/tests/racket/benchmarks/common/takr2-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/triangle-typed.rkt b/collects/tests/racket/benchmarks/common/triangle-typed.rktl
similarity index 100%
rename from collects/tests/racket/benchmarks/common/triangle-typed.rkt
rename to collects/tests/racket/benchmarks/common/triangle-typed.rktl
diff --git a/collects/tests/racket/benchmarks/common/wrap-typed-non-optimizing.rkt b/collects/tests/racket/benchmarks/common/wrap-typed-non-optimizing.rkt
index 620935ab4d..79ccc456fb 100644
--- a/collects/tests/racket/benchmarks/common/wrap-typed-non-optimizing.rkt
+++ b/collects/tests/racket/benchmarks/common/wrap-typed-non-optimizing.rkt
@@ -7,7 +7,7 @@
   (define-syntax (module-begin stx)
     (let ([name (symbol->string (syntax-property stx 'enclosing-module-name))])
       #`(ts:#%module-begin
-         (include #,(format "~a.rkt"
+         (include #,(format "~a.rktl"
                             (substring name
                                        0
                                        (caar (regexp-match-positions
diff --git a/collects/tests/racket/benchmarks/common/wrap-typed-optimizing.rkt b/collects/tests/racket/benchmarks/common/wrap-typed-optimizing.rkt
index 60a604e757..00337d8296 100644
--- a/collects/tests/racket/benchmarks/common/wrap-typed-optimizing.rkt
+++ b/collects/tests/racket/benchmarks/common/wrap-typed-optimizing.rkt
@@ -7,7 +7,7 @@
   (define-syntax (module-begin stx)
     (let ([name (symbol->string (syntax-property stx 'enclosing-module-name))])
       #`(ts:#%module-begin #:optimize
-         (include #,(format "~a.rkt"
+         (include #,(format "~a.rktl"
                             (substring name
                                        0
                                        (caar (regexp-match-positions