From 12eea12a7df909f61aec1cbef15d59d9d82eb9e1 Mon Sep 17 00:00:00 2001
From: Eric Dobson <eric.n.dobson@gmail.com>
Date: Thu, 20 Jun 2013 22:40:33 -0700
Subject: [PATCH] Make optimizer read TR expected logs as a list of entries
 versus a raw string.

original commit: ccf947e31e50678067ac6aa546ff1fd7f4d37ad9
---
 .../typed-racket/optimizer/logging.rkt        |  11 +-
 .../missed-optimizations/all-real.rkt         |   9 +-
 .../optimizer/missed-optimizations/fixnum.rkt |  29 ++-
 .../missed-optimizations/multi-file1.rkt      |   5 +-
 .../missed-optimizations/multi-file2.rkt      |   9 +-
 .../multiple-irritants.rkt                    |   5 +-
 .../missed-optimizations/nested-same-kind.rkt |  41 ++--
 .../optimizer/missed-optimizations/pair.rkt   |  67 ++++---
 .../missed-optimizations/precision-loss.rkt   |   1 -
 .../real-in-float-expr.rkt                    |  15 +-
 .../missed-optimizations/unary-float.rkt      |  13 +-
 .../unexpected-complex.rkt                    |   9 +-
 .../tests/typed-racket/optimizer/run.rkt      |   3 +-
 .../typed-racket/optimizer/tests/add1.rkt     |   9 +-
 .../optimizer/tests/annotations.rkt           |   9 +-
 .../optimizer/tests/apply-plus.rkt            |   5 +-
 .../optimizer/tests/begin-float.rkt           |   5 +-
 .../optimizer/tests/binary-fixnum.rkt         |   5 +-
 .../optimizer/tests/binary-nonzero-fixnum.rkt |   5 +-
 .../optimizer/tests/bounds-check.rkt          |  29 ++-
 .../typed-racket/optimizer/tests/box.rkt      |   7 +-
 .../optimizer/tests/case-arrow.rkt            |  17 +-
 .../tests/case-lambda-dead-branch.rkt         |   5 +-
 .../optimizer/tests/complex-exp.rkt           |   9 +-
 .../optimizer/tests/cross-module-struct.rkt   |   1 -
 .../optimizer/tests/cross-module-struct2.rkt  |   3 +-
 .../optimizer/tests/dead-else.rkt             |  13 +-
 .../optimizer/tests/dead-inf-comp.rkt         | 121 ++++++------
 .../optimizer/tests/dead-substructs.rkt       |   5 +-
 .../optimizer/tests/dead-then.rkt             |  13 +-
 .../optimizer/tests/define-begin-float.rkt    |   7 +-
 .../optimizer/tests/define-call-float.rkt     |   3 +-
 .../optimizer/tests/define-float.rkt          |   3 +-
 .../optimizer/tests/define-pair.rkt           |   3 +-
 .../optimizer/tests/derived-pair.rkt          |  17 +-
 .../optimizer/tests/derived-pair2.rkt         |  49 +++--
 .../optimizer/tests/derived-pair3.rkt         | 129 +++++++------
 .../optimizer/tests/different-langs.rkt       |   3 +-
 .../optimizer/tests/double-float.rkt          |   3 +-
 .../optimizer/tests/drop-pure-pred.rkt        |   1 -
 .../optimizer/tests/exact-inexact.rkt         |  17 +-
 .../typed-racket/optimizer/tests/expt.rkt     |   5 +-
 .../optimizer/tests/false-huh-dead-code.rkt   |   5 +-
 .../optimizer/tests/fixnum-bounded-expr.rkt   |  51 +++--
 .../optimizer/tests/fixnum-comparison.rkt     |   7 +-
 .../optimizer/tests/float-comp.rkt            |   3 +-
 .../tests/float-complex-conjugate-top.rkt     |   9 +-
 .../tests/float-complex-conjugate.rkt         |  11 +-
 .../optimizer/tests/float-complex-div.rkt     |   9 +-
 .../optimizer/tests/float-complex-fixnum.rkt  |  15 +-
 .../tests/float-complex-float-div.rkt         |  53 +++---
 .../tests/float-complex-float-mul.rkt         |  39 ++--
 .../tests/float-complex-float-small.rkt       |  37 ++--
 .../optimizer/tests/float-complex-float.rkt   |  27 ++-
 .../optimizer/tests/float-complex-i.rkt       |  11 +-
 .../optimizer/tests/float-complex-integer.rkt |   7 +-
 .../optimizer/tests/float-complex-mult.rkt    |   9 +-
 .../optimizer/tests/float-complex-parts.rkt   |   9 +-
 .../optimizer/tests/float-complex-parts2.rkt  |  57 +++---
 .../optimizer/tests/float-complex-parts3.rkt  |  47 +++--
 .../optimizer/tests/float-complex-sin.rkt     |  23 ++-
 .../optimizer/tests/float-complex.rkt         |   9 +-
 .../optimizer/tests/float-fun.rkt             |   3 +-
 .../optimizer/tests/float-promotion.rkt       |   1 -
 .../optimizer/tests/float-real.rkt            |  17 +-
 .../optimizer/tests/flvector-length.rkt       |   3 +-
 .../typed-racket/optimizer/tests/fx-fl.rkt    |   3 +-
 .../typed-racket/optimizer/tests/in-bytes.rkt |   7 +-
 .../typed-racket/optimizer/tests/in-list.rkt  |   7 +-
 .../typed-racket/optimizer/tests/in-range.rkt |   7 +-
 .../optimizer/tests/in-string.rkt             |   7 +-
 .../optimizer/tests/in-vector.rkt             |   7 +-
 .../tests/invalid-binary-nonzero-fixnum.rkt   |   3 +-
 .../optimizer/tests/invalid-derived-pair.rkt  |   5 +-
 .../optimizer/tests/invalid-exact-inexact.rkt |   3 +-
 .../optimizer/tests/invalid-float-comp.rkt    |   1 -
 .../tests/invalid-float-promotion.rkt         |   9 +-
 .../optimizer/tests/invalid-fxquotient.rkt    |   3 +-
 .../tests/invalid-inexact-complex-parts.rkt   |   1 -
 .../optimizer/tests/invalid-log-complex.rkt   |   3 +-
 .../tests/invalid-make-flrectangular.rkt      |   1 -
 .../optimizer/tests/invalid-make-polar.rkt    |   1 -
 .../optimizer/tests/invalid-mpair.rkt         |   3 +-
 .../optimizer/tests/invalid-sqrt.rkt          |   3 +-
 .../optimizer/tests/invalid-unboxed-let.rkt   |  41 ++--
 .../optimizer/tests/invalid-unboxed-let2.rkt  |  19 +-
 .../optimizer/tests/invalid-vector-ref.rkt    |   3 +-
 .../optimizer/tests/invalid-vector-set.rkt    |   3 +-
 .../optimizer/tests/known-length-lists.rkt    |   1 -
 .../optimizer/tests/known-vector-length.rkt   |   5 +-
 .../optimizer/tests/let-float.rkt             |   5 +-
 .../typed-racket/optimizer/tests/let-rhs.rkt  |   3 +-
 .../typed-racket/optimizer/tests/list.rkt     |  27 ++-
 .../optimizer/tests/literal-int.rkt           |   3 +-
 .../optimizer/tests/magnitude.rkt             |   5 +-
 .../optimizer/tests/make-flrectangular.rkt    |   5 +-
 .../optimizer/tests/make-polar.rkt            |  25 ++-
 .../optimizer/tests/maybe-exact-complex.rkt   |   7 +-
 .../optimizer/tests/module-path.rkt           |   3 +-
 .../typed-racket/optimizer/tests/mpair.rkt    |  15 +-
 .../optimizer/tests/multi-flcomp.rkt          |  13 +-
 .../optimizer/tests/n-ary-float-complex.rkt   |  11 +-
 .../optimizer/tests/n-ary-float.rkt           |   3 +-
 .../optimizer/tests/nested-float-complex.rkt  |  11 +-
 .../optimizer/tests/nested-float.rkt          |   5 +-
 .../optimizer/tests/nested-float2.rkt         |   5 +-
 .../optimizer/tests/nested-let-loop.rkt       |  65 ++++---
 .../optimizer/tests/nested-pair1.rkt          |   5 +-
 .../optimizer/tests/nested-pair2.rkt          |   5 +-
 .../optimizer/tests/nested-unboxed-let.rkt    |  35 ++--
 .../optimizer/tests/one-arg-arith.rkt         |  31 ++--
 .../typed-racket/optimizer/tests/pair-fun.rkt |   3 +-
 .../tests/pair-known-length-list.rkt          |  19 +-
 .../typed-racket/optimizer/tests/pr13468.rkt  |   1 -
 .../typed-racket/optimizer/tests/pr13788.rkt  |   3 +-
 .../typed-racket/optimizer/tests/quote.rkt    |   1 -
 .../optimizer/tests/rational-literal.rkt      |   3 +-
 .../optimizer/tests/real-part-loop.rkt        |   1 -
 .../optimizer/tests/silent-dead-branch.rkt    |   3 +-
 .../optimizer/tests/simple-float.rkt          |   3 +-
 .../optimizer/tests/simple-pair.rkt           |   3 +-
 .../optimizer/tests/sqrt-segfault.rkt         |   7 +-
 .../typed-racket/optimizer/tests/sqrt.rkt     |   3 +-
 .../optimizer/tests/string-length.rkt         |   5 +-
 .../typed-racket/optimizer/tests/structs.rkt  |   7 +-
 .../optimizer/tests/ternary-equality.rkt      |   3 +-
 .../optimizer/tests/unary-fixnum-nested.rkt   |   7 +-
 .../optimizer/tests/unary-fixnum.rkt          |   5 +-
 .../optimizer/tests/unary-float.rkt           |   3 +-
 .../optimizer/tests/unboxed-exp.rkt           |  27 ++-
 .../optimizer/tests/unboxed-for.rkt           |  69 ++++---
 .../tests/unboxed-let-functions1.rkt          |  27 ++-
 .../tests/unboxed-let-functions2.rkt          |  37 ++--
 .../tests/unboxed-let-functions3.rkt          |  27 ++-
 .../tests/unboxed-let-functions4.rkt          |  27 ++-
 .../tests/unboxed-let-functions5.rkt          |   7 +-
 .../tests/unboxed-let-functions6.rkt          |  37 ++--
 .../tests/unboxed-let-functions7.rkt          |  35 ++--
 .../tests/unboxed-let-functions8.rkt          |   7 +-
 .../optimizer/tests/unboxed-let.rkt           |  45 +++--
 .../optimizer/tests/unboxed-let2.rkt          |  33 ++--
 .../optimizer/tests/unboxed-let3.rkt          |  23 ++-
 .../tests/unboxed-letrec-syntaxes+values.rkt  |  21 +--
 .../optimizer/tests/unboxed-letrec.rkt        |  29 ++-
 .../tests/unboxed-make-rectangular.rkt        |  33 ++--
 .../optimizer/tests/vector-bounds-check.rkt   |   5 +-
 .../optimizer/tests/vector-chaperone1.rkt     |   1 -
 .../optimizer/tests/vector-chaperone2.rkt     |   3 +-
 .../optimizer/tests/vector-length-nested.rkt  |   5 +-
 .../optimizer/tests/vector-length.rkt         |   5 +-
 .../optimizer/tests/vector-ref-set-ref.rkt    |   7 +-
 .../optimizer/tests/vector-ref.rkt            |   3 +-
 .../optimizer/tests/vector-ref2.rkt           |   3 +-
 .../optimizer/tests/vector-set-quote.rkt      |   3 +-
 .../optimizer/tests/vector-set.rkt            |   3 +-
 .../optimizer/tests/vector-set2.rkt           |   3 +-
 .../optimizer/tests/vector-sum.rkt            | 175 +++++++++---------
 .../optimizer/tests/with-type.rkt             |   3 +-
 .../typed-racket/optimizer/tests/zero.rkt     |   7 +-
 .../typed-racket/optimizer/transform.rkt      |   3 +-
 .../tests/typed-racket/places.rkt             |  10 +-
 161 files changed, 1130 insertions(+), 1286 deletions(-)

diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt
index 19d0892d..18516a8e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt
@@ -2,10 +2,11 @@
 
 (require racket/set racket/string racket/match racket/list
          unstable/syntax unstable/logging
+         data/queue
          "../utils/tc-utils.rkt")
 
 (provide log-optimization log-missed-optimization log-optimization-info
-         with-tr-logging-to-port
+         with-tr-logging-to-queue
          (struct-out log-entry)
          (struct-out opt-log-entry)
          (struct-out missed-opt-log-entry)
@@ -127,12 +128,10 @@
 
 ;;--------------------------------------------------------------------
 
-(define (with-tr-logging-to-port port thunk)
+(define (with-tr-logging-to-queue queue thunk)
   (with-intercepted-logging
    (lambda (l)
-     (displayln ; print log message
-      (string-trim (vector-ref l 1) "TR-optimizer: ") ; remove logger prefix
-      port)
-     (flush-output port))
+     (enqueue! queue
+      (string-trim (vector-ref l 1) "TR-optimizer: "))) ; remove logger prefix
    thunk
    'debug 'TR-optimizer))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/all-real.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/all-real.rkt
index 8c4c06fc..4a61b271 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/all-real.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/all-real.rkt
@@ -1,10 +1,9 @@
 #;#;
 #<<END
-TR missed opt: all-real.rkt 30:0 (+ (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 30:8 3, 30:21 4
-TR info: all-real.rkt 30:0 (+ (ann 3 Real) (ann 4 Real)) -- exact real arith
-TR missed opt: all-real.rkt 31:0 (* (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 31:8 3, 31:21 4
-TR info: all-real.rkt 31:0 (* (ann 3 Real) (ann 4 Real)) -- exact real arith
-
+TR missed opt: all-real.rkt 29:0 (+ (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 29:8 3, 29:21 4
+TR info: all-real.rkt 29:0 (+ (ann 3 Real) (ann 4 Real)) -- exact real arith
+TR missed opt: all-real.rkt 30:0 (* (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 30:8 3, 30:21 4
+TR info: all-real.rkt 30:0 (* (ann 3 Real) (ann 4 Real)) -- exact real arith
 END
 #<<END
 7
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum.rkt
index 6a51fb87..111ec4ab 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum.rkt
@@ -1,20 +1,19 @@
 #;#;
 #<<END
-TR opt: fixnum.rkt 33:10 (* x y) -- fixnum bounded expr
-TR missed opt: fixnum.rkt 36:0 (+ (ann z Fixnum) 234) -- out of fixnum range
-TR missed opt: fixnum.rkt 37:0 (* (ann x Index) (ann y Index)) -- out of fixnum range
-TR opt: fixnum.rkt 40:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 40:15 (+ 301 302) -- fixnum bounded expr
-TR missed opt: fixnum.rkt 40:0 (+ (+ 300 301) (+ 301 302)) -- out of fixnum range
-TR opt: fixnum.rkt 40:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 40:15 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 40:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 40:15 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 41:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 41:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 41:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 41:17 (+ 301 302) -- fixnum bounded expr
-
+TR opt: fixnum.rkt 38:10 (* x y) -- fixnum bounded expr
+TR missed opt: fixnum.rkt 41:0 (+ (ann z Fixnum) 234) -- out of fixnum range
+TR missed opt: fixnum.rkt 42:0 (* (ann x Index) (ann y Index)) -- out of fixnum range
+TR opt: fixnum.rkt 45:3 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 45:15 (+ 301 302) -- fixnum bounded expr
+TR missed opt: fixnum.rkt 45:0 (+ (+ 300 301) (+ 301 302)) -- out of fixnum range
+TR opt: fixnum.rkt 45:3 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 45:15 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum.rkt 45:3 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 45:15 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum.rkt 46:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 46:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum.rkt 46:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 46:17 (+ 301 302) -- fixnum bounded expr
 END
 #<<END
 468
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt
index 9df6fd77..626f80c2 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR missed opt: multi-file1.rkt 14:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 14:12 3
-TR info: multi-file1.rkt 14:2 (* x (ann 3 Integer)) -- exact real arith
-
+TR missed opt: multi-file1.rkt 13:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 13:12 3
+TR info: multi-file1.rkt 13:2 (* x (ann 3 Integer)) -- exact real arith
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt
index 81a64cee..a36af300 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt
@@ -1,10 +1,9 @@
 #;#;
 #<<END
-TR missed opt: multi-file1.rkt 14:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 14:12 3
-TR info: multi-file1.rkt 14:2 (* x (ann 3 Integer)) -- exact real arith
-TR opt: multi-file2.rkt 17:10 (+ 3 5) -- fixnum bounded expr
-TR opt: multi-file2.rkt 17:3 (* 3.4 (+ 3 5)) -- binary float
-
+TR missed opt: multi-file1.rkt 13:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 13:12 3
+TR info: multi-file1.rkt 13:2 (* x (ann 3 Integer)) -- exact real arith
+TR opt: multi-file2.rkt 16:10 (+ 3 5) -- fixnum bounded expr
+TR opt: multi-file2.rkt 16:3 (* 3.4 (+ 3 5)) -- binary float
 END
 #<<END
 81.6
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multiple-irritants.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multiple-irritants.rkt
index 96a05a04..fe38573f 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multiple-irritants.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multiple-irritants.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR missed opt: multiple-irritants.rkt 14:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- all args float-arg-expr, result not Float -- caused by: 14:8 4, 14:24 5
-TR info: multiple-irritants.rkt 14:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- exact real arith
-
+TR missed opt: multiple-irritants.rkt 13:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- all args float-arg-expr, result not Float -- caused by: 13:8 4, 13:24 5
+TR info: multiple-irritants.rkt 13:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- exact real arith
 END
 #<<END
 120.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/nested-same-kind.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/nested-same-kind.rkt
index 65c6abf3..62c84a50 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/nested-same-kind.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/nested-same-kind.rkt
@@ -1,26 +1,25 @@
 #;#;
 #<<END
-TR missed opt: nested-same-kind.rkt 38:7 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 38:19 4
-TR info: nested-same-kind.rkt 38:7 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 38:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 38:7 (* 3.0 (ann 4 Integer))
-TR info: nested-same-kind.rkt 38:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 39:14 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 39:26 4
-TR info: nested-same-kind.rkt 39:14 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 39:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 39:14 (* 3.0 (ann 4 Integer))
-TR info: nested-same-kind.rkt 39:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 39:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- all args float-arg-expr, result not Float -- caused by: 39:7 (* 2.0 (* 3.0 (ann 4 Integer)))
-TR info: nested-same-kind.rkt 39:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 40:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- all args float-arg-expr, result not Float -- caused by: 40:19 4, 40:35 5
-TR info: nested-same-kind.rkt 40:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 40:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- all args float-arg-expr, result not Float -- caused by: 40:7 (* 3.0 (ann 4 Integer) (ann 5 Integer))
-TR info: nested-same-kind.rkt 40:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 41:3 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 41:15 4
-TR info: nested-same-kind.rkt 41:3 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 41:27 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 41:39 4
-TR info: nested-same-kind.rkt 41:27 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 41:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 41:3 (* 3.0 (ann 4 Integer)), 41:27 (* 3.0 (ann 4 Integer))
-TR info: nested-same-kind.rkt 41:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- exact real arith
-
+TR missed opt: nested-same-kind.rkt 37:7 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 37:19 4
+TR info: nested-same-kind.rkt 37:7 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 37:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 37:7 (* 3.0 (ann 4 Integer))
+TR info: nested-same-kind.rkt 37:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
+TR missed opt: nested-same-kind.rkt 38:14 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 38:26 4
+TR info: nested-same-kind.rkt 38:14 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 38:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 38:14 (* 3.0 (ann 4 Integer))
+TR info: nested-same-kind.rkt 38:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
+TR missed opt: nested-same-kind.rkt 38:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- all args float-arg-expr, result not Float -- caused by: 38:7 (* 2.0 (* 3.0 (ann 4 Integer)))
+TR info: nested-same-kind.rkt 38:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- exact real arith
+TR missed opt: nested-same-kind.rkt 39:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- all args float-arg-expr, result not Float -- caused by: 39:19 4, 39:35 5
+TR info: nested-same-kind.rkt 39:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 39:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- all args float-arg-expr, result not Float -- caused by: 39:7 (* 3.0 (ann 4 Integer) (ann 5 Integer))
+TR info: nested-same-kind.rkt 39:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- exact real arith
+TR missed opt: nested-same-kind.rkt 40:3 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 40:15 4
+TR info: nested-same-kind.rkt 40:3 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 40:27 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 40:39 4
+TR info: nested-same-kind.rkt 40:27 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 40:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 40:3 (* 3.0 (ann 4 Integer)), 40:27 (* 3.0 (ann 4 Integer))
+TR info: nested-same-kind.rkt 40:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- exact real arith
 END
 #<<END
 24.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/pair.rkt
index 34f6bb71..47a7c156 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/pair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/pair.rkt
@@ -1,39 +1,38 @@
 #;#;
 #<<END
-TR missed opt: pair.rkt 62:0 (car (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 62:10 (list 1 2 3)
-TR opt: pair.rkt 63:0 (car (list 1 2 3)) -- pair
-TR missed opt: pair.rkt 64:0 (cdr (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 64:10 (list 1 2 3)
-TR opt: pair.rkt 65:0 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 66:0 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 66:5 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 67:0 (cdr (cdr (cdr (list 1 2 3)))) -- pair
-TR opt: pair.rkt 67:5 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 67:10 (cdr (list 1 2 3)) -- pair
-TR missed opt: pair.rkt 68:16 (cdr (cdr (cdr (cdr (list 1 2 3))))) -- car/cdr on a potentially empty list -- caused by: 68:21 (cdr (cdr (cdr (list 1 2 3))))
-TR opt: pair.rkt 68:21 (cdr (cdr (cdr (list 1 2 3)))) -- pair
-TR opt: pair.rkt 68:26 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 68:31 (cdr (list 1 2 3)) -- pair
-TR missed opt: pair.rkt 71:0 (mcar (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 71:6 (values (ann (mlist 1) (MListof Byte)))
-TR opt: pair.rkt 72:0 (mcar (mlist 1 2 3)) -- pair
-TR missed opt: pair.rkt 73:0 (mcdr (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 73:6 (values (ann (mlist 1) (MListof Byte)))
-TR opt: pair.rkt 74:0 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 75:0 (mcdr (mcdr (mlist 1 2 3))) -- pair
-TR opt: pair.rkt 75:6 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 76:0 (mcdr (mcdr (mcdr (mlist 1 2 3)))) -- pair
-TR opt: pair.rkt 76:6 (mcdr (mcdr (mlist 1 2 3))) -- pair
-TR opt: pair.rkt 76:12 (mcdr (mlist 1 2 3)) -- pair
-TR missed opt: pair.rkt 77:0 (set-mcar! (values (ann (mlist 2) (MListof Byte))) 2) -- car/cdr on a potentially empty list -- caused by: 77:11 (values (ann (mlist 2) (MListof Byte)))
-TR opt: pair.rkt 78:0 (set-mcar! (mlist 2 3 4) 2) -- pair
-TR missed opt: pair.rkt 79:0 (set-mcdr! (values (ann (mlist 2) (MListof Byte))) (values (ann (mlist 2) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 79:11 (values (ann (mlist 2) (MListof Byte)))
-TR opt: pair.rkt 81:0 (mcar (mcons 2 3)) -- pair
-TR opt: pair.rkt 82:0 (mcdr (mcons 2 3)) -- pair
-TR opt: pair.rkt 83:0 (set-mcar! (mcons 2 3) 3) -- pair
-TR opt: pair.rkt 84:0 (set-mcdr! (mcons 2 3) 4) -- pair
-TR missed opt: pair.rkt 85:17 (mcar (quote ())) -- car/cdr on a potentially empty list -- caused by: 85:23 (quote ())
-TR missed opt: pair.rkt 86:17 (mcdr (quote ())) -- car/cdr on a potentially empty list -- caused by: 86:23 (quote ())
-TR missed opt: pair.rkt 87:17 (set-mcar! (quote ()) 2) -- car/cdr on a potentially empty list -- caused by: 87:28 (quote ())
-TR missed opt: pair.rkt 88:17 (set-mcdr! (ann (quote ()) (MListof Integer)) (ann (mlist 3) (MListof Integer))) -- car/cdr on a potentially empty list -- caused by: 88:33 (quote ())
-
+TR missed opt: pair.rkt 61:0 (car (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 61:10 (list 1 2 3)
+TR opt: pair.rkt 62:0 (car (list 1 2 3)) -- pair
+TR missed opt: pair.rkt 63:0 (cdr (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 63:10 (list 1 2 3)
+TR opt: pair.rkt 64:0 (cdr (list 1 2 3)) -- pair
+TR opt: pair.rkt 65:0 (cdr (cdr (list 1 2 3))) -- pair
+TR opt: pair.rkt 65:5 (cdr (list 1 2 3)) -- pair
+TR opt: pair.rkt 66:0 (cdr (cdr (cdr (list 1 2 3)))) -- pair
+TR opt: pair.rkt 66:5 (cdr (cdr (list 1 2 3))) -- pair
+TR opt: pair.rkt 66:10 (cdr (list 1 2 3)) -- pair
+TR missed opt: pair.rkt 67:16 (cdr (cdr (cdr (cdr (list 1 2 3))))) -- car/cdr on a potentially empty list -- caused by: 67:21 (cdr (cdr (cdr (list 1 2 3))))
+TR opt: pair.rkt 67:21 (cdr (cdr (cdr (list 1 2 3)))) -- pair
+TR opt: pair.rkt 67:26 (cdr (cdr (list 1 2 3))) -- pair
+TR opt: pair.rkt 67:31 (cdr (list 1 2 3)) -- pair
+TR missed opt: pair.rkt 70:0 (mcar (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 70:6 (values (ann (mlist 1) (MListof Byte)))
+TR opt: pair.rkt 71:0 (mcar (mlist 1 2 3)) -- pair
+TR missed opt: pair.rkt 72:0 (mcdr (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 72:6 (values (ann (mlist 1) (MListof Byte)))
+TR opt: pair.rkt 73:0 (mcdr (mlist 1 2 3)) -- pair
+TR opt: pair.rkt 74:0 (mcdr (mcdr (mlist 1 2 3))) -- pair
+TR opt: pair.rkt 74:6 (mcdr (mlist 1 2 3)) -- pair
+TR opt: pair.rkt 75:0 (mcdr (mcdr (mcdr (mlist 1 2 3)))) -- pair
+TR opt: pair.rkt 75:6 (mcdr (mcdr (mlist 1 2 3))) -- pair
+TR opt: pair.rkt 75:12 (mcdr (mlist 1 2 3)) -- pair
+TR missed opt: pair.rkt 76:0 (set-mcar! (values (ann (mlist 2) (MListof Byte))) 2) -- car/cdr on a potentially empty list -- caused by: 76:11 (values (ann (mlist 2) (MListof Byte)))
+TR opt: pair.rkt 77:0 (set-mcar! (mlist 2 3 4) 2) -- pair
+TR missed opt: pair.rkt 78:0 (set-mcdr! (values (ann (mlist 2) (MListof Byte))) (values (ann (mlist 2) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 78:11 (values (ann (mlist 2) (MListof Byte)))
+TR opt: pair.rkt 80:0 (mcar (mcons 2 3)) -- pair
+TR opt: pair.rkt 81:0 (mcdr (mcons 2 3)) -- pair
+TR opt: pair.rkt 82:0 (set-mcar! (mcons 2 3) 3) -- pair
+TR opt: pair.rkt 83:0 (set-mcdr! (mcons 2 3) 4) -- pair
+TR missed opt: pair.rkt 84:17 (mcar (quote ())) -- car/cdr on a potentially empty list -- caused by: 84:23 (quote ())
+TR missed opt: pair.rkt 85:17 (mcdr (quote ())) -- car/cdr on a potentially empty list -- caused by: 85:23 (quote ())
+TR missed opt: pair.rkt 86:17 (set-mcar! (quote ()) 2) -- car/cdr on a potentially empty list -- caused by: 86:28 (quote ())
+TR missed opt: pair.rkt 87:17 (set-mcdr! (ann (quote ()) (MListof Integer)) (ann (mlist 3) (MListof Integer))) -- car/cdr on a potentially empty list -- caused by: 87:33 (quote ())
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/precision-loss.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/precision-loss.rkt
index dcc35b5a..640d67bf 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/precision-loss.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/precision-loss.rkt
@@ -19,7 +19,6 @@ TR missed opt: precision-loss.rkt 52:14 (* 2.0 (* (r 3/4) 2/3)) -- all args floa
 TR info: precision-loss.rkt 52:14 (* 2.0 (* (r 3/4) 2/3)) -- exact real arith
 TR missed opt: precision-loss.rkt 51:0 (* (* (r 3/4) 2/3) (car (list (* 2.0 (* (r 3/4) 2/3)))) 2.0) -- all args float-arg-expr, result not Float -- caused by: 51:3 (* (r 3/4) 2/3), 52:3 (car (list (* 2.0 (* (r 3/4) 2/3))))
 TR info: precision-loss.rkt 51:0 (* (* (r 3/4) 2/3) (car (list (* 2.0 (* (r 3/4) 2/3)))) 2.0) -- exact real arith
-
 END
 #<<END
 2.5
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/real-in-float-expr.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/real-in-float-expr.rkt
index 6420ba63..cc5aa676 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/real-in-float-expr.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/real-in-float-expr.rkt
@@ -1,13 +1,12 @@
 #;#;
 #<<END
-TR missed opt: real-in-float-expr.rkt 24:0 (* (ann 3 Real) 2.3) -- all args float-arg-expr, result not Float -- caused by: 24:8 3
-TR info: real-in-float-expr.rkt 24:0 (* (ann 3 Real) 2.3) -- exact real arith
-TR opt: real-in-float-expr.rkt 29:0 (* 2 3) -- fixnum bounded expr
-TR opt: real-in-float-expr.rkt 30:0 (+ 2 3) -- fixnum bounded expr
-TR info: real-in-float-expr.rkt 31:0 (+ 2/3 3/4) -- exact real arith
-TR missed opt: real-in-float-expr.rkt 33:0 (* (ann 2 Natural) 2.0) -- all args float-arg-expr, result not Float -- caused by: 33:8 2
-TR info: real-in-float-expr.rkt 33:0 (* (ann 2 Natural) 2.0) -- exact real arith
-
+TR missed opt: real-in-float-expr.rkt 23:0 (* (ann 3 Real) 2.3) -- all args float-arg-expr, result not Float -- caused by: 23:8 3
+TR info: real-in-float-expr.rkt 23:0 (* (ann 3 Real) 2.3) -- exact real arith
+TR opt: real-in-float-expr.rkt 28:0 (* 2 3) -- fixnum bounded expr
+TR opt: real-in-float-expr.rkt 29:0 (+ 2 3) -- fixnum bounded expr
+TR info: real-in-float-expr.rkt 30:0 (+ 2/3 3/4) -- exact real arith
+TR missed opt: real-in-float-expr.rkt 32:0 (* (ann 2 Natural) 2.0) -- all args float-arg-expr, result not Float -- caused by: 32:8 2
+TR info: real-in-float-expr.rkt 32:0 (* (ann 2 Natural) 2.0) -- exact real arith
 END
 #<<END
 6.8999999999999995
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unary-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unary-float.rkt
index 33379db3..8c1888db 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unary-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unary-float.rkt
@@ -1,12 +1,11 @@
 #;#;
 #<<END
-TR missed opt: unary-float.rkt 21:0 (sin (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 21:10 3.4
-TR info: unary-float.rkt 21:0 (sin (ann 3.4 Real)) -- exact real arith
-TR missed opt: unary-float.rkt 22:0 (sin 3) -- all args float-arg-expr, result not Float -- caused by: 22:5 3
-TR info: unary-float.rkt 22:0 (sin 3) -- exact real arith
-TR missed opt: unary-float.rkt 23:0 (abs (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 23:10 3.4
-TR info: unary-float.rkt 23:0 (abs (ann 3.4 Real)) -- exact real arith
-
+TR missed opt: unary-float.rkt 20:0 (sin (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 20:10 3.4
+TR info: unary-float.rkt 20:0 (sin (ann 3.4 Real)) -- exact real arith
+TR missed opt: unary-float.rkt 21:0 (sin 3) -- all args float-arg-expr, result not Float -- caused by: 21:5 3
+TR info: unary-float.rkt 21:0 (sin 3) -- exact real arith
+TR missed opt: unary-float.rkt 22:0 (abs (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 22:10 3.4
+TR info: unary-float.rkt 22:0 (abs (ann 3.4 Real)) -- exact real arith
 END
 #<<END
 -0.2555411020268312
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unexpected-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unexpected-complex.rkt
index 41c20c8a..65f29cb0 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unexpected-complex.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unexpected-complex.rkt
@@ -1,10 +1,9 @@
 #;#;
 #<<END
-TR missed opt: unexpected-complex.rkt 19:0 (sqrt (ann 4 Integer)) -- unexpected complex type
-TR opt: unexpected-complex.rkt 20:3 1.2+3.4i -- unboxed literal
-TR opt: unexpected-complex.rkt 20:12 2.0 -- float-arg-expr in complex ops
-TR opt: unexpected-complex.rkt 20:0 (+ 1.2+3.4i 2.0) -- unboxed binary float complex
-
+TR missed opt: unexpected-complex.rkt 18:0 (sqrt (ann 4 Integer)) -- unexpected complex type
+TR opt: unexpected-complex.rkt 19:3 1.2+3.4i -- unboxed literal
+TR opt: unexpected-complex.rkt 19:12 2.0 -- float-arg-expr in complex ops
+TR opt: unexpected-complex.rkt 19:0 (+ 1.2+3.4i 2.0) -- unboxed binary float complex
 END
 #<<END
 2
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt
index 3cb9f35e..23a1a1b6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt
@@ -19,7 +19,8 @@
         (with-input-from-file (build-path dir name)
           (lambda () ; from the test file
             (read-line) ; skip the #;#;
-            (values (read) (read)))))
+            (values (for/list ((l (in-lines (open-input-string (read))))) l)
+                    (read)))))
 
       (check-equal? log expected-log)
       (check-equal? output expected-output))))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt
index 49e18943..ff654be1 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt
@@ -1,10 +1,9 @@
 #;#;
 #<<END
-TR opt: add1.rkt 18:5 (add1 5) -- fixnum add1
-TR opt: add1.rkt 19:5 (sub1 3) -- fixnum sub1
-TR opt: add1.rkt 20:5 (add1 2.3) -- float add1
-TR opt: add1.rkt 21:5 (sub1 2.25) -- float sub1
-
+TR opt: add1.rkt 17:5 (add1 5) -- fixnum add1
+TR opt: add1.rkt 18:5 (sub1 3) -- fixnum sub1
+TR opt: add1.rkt 19:5 (add1 2.3) -- float add1
+TR opt: add1.rkt 20:5 (sub1 2.25) -- float sub1
 END
 #<<END
 6
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt
index b772af11..b2a0f0b0 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt
@@ -1,10 +1,9 @@
 #;#;
 #<<END
-TR opt: annotations.rkt 12:10 (+ 1.0 2.0) -- binary float
-TR opt: annotations.rkt 15:10 (+ 1.0 2.0) -- binary float
-TR opt: annotations.rkt 18:10 (+ 1.0 2.0) -- binary float
-TR opt: annotations.rkt 20:15 (+ 1.0 2.0) -- binary float
-
+TR opt: annotations.rkt 11:10 (+ 1.0 2.0) -- binary float
+TR opt: annotations.rkt 14:10 (+ 1.0 2.0) -- binary float
+TR opt: annotations.rkt 17:10 (+ 1.0 2.0) -- binary float
+TR opt: annotations.rkt 19:15 (+ 1.0 2.0) -- binary float
 END
 ""
 #lang typed/racket #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt
index be75e07d..5571caa3 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: apply-plus.rkt 16:0 (apply + (map add1 (list 1 2 3))) -- apply-map
-TR opt: apply-plus.rkt 17:0 (apply * (map add1 (list 1 2 3))) -- apply-map
-
+TR opt: apply-plus.rkt 15:0 (apply + (map add1 (list 1 2 3))) -- apply-map
+TR opt: apply-plus.rkt 16:0 (apply * (map add1 (list 1 2 3))) -- apply-map
 END
 #<<END
 9
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt
index 35a10aba..1b1a9ed5 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: begin-float.rkt 16:7 (- 2.0 3.0) -- binary float
-TR opt: begin-float.rkt 17:7 (* 2.0 3.0) -- binary float
-
+TR opt: begin-float.rkt 15:7 (- 2.0 3.0) -- binary float
+TR opt: begin-float.rkt 16:7 (* 2.0 3.0) -- binary float
 END
 #<<END
 -1.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt
index 7055e3b3..5c13f496 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: binary-fixnum.rkt 14:15 (vector-length v) -- vector-length
-TR opt: binary-fixnum.rkt 14:2 (bitwise-and (vector-length v) 1) -- binary fixnum
-
+TR opt: binary-fixnum.rkt 13:15 (vector-length v) -- vector-length
+TR opt: binary-fixnum.rkt 13:2 (bitwise-and (vector-length v) 1) -- binary fixnum
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-nonzero-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-nonzero-fixnum.rkt
index 9e8d2f55..bbbe9335 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-nonzero-fixnum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-nonzero-fixnum.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: binary-nonzero-fixnum.rkt 15:8 (vector-length (quote #(1 2 3))) -- known-length vector-length
-TR opt: binary-nonzero-fixnum.rkt 15:0 (modulo (vector-length (quote #(1 2 3))) 2) -- binary nonzero fixnum
-
+TR opt: binary-nonzero-fixnum.rkt 14:8 (vector-length (quote #(1 2 3))) -- known-length vector-length
+TR opt: binary-nonzero-fixnum.rkt 14:0 (modulo (vector-length (quote #(1 2 3))) 2) -- binary nonzero fixnum
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt
index 6c980519..4c2b3967 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt
@@ -1,20 +1,19 @@
 #;#;
 #<<END
-TR opt: bounds-check.rkt 35:2 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 38:2 (vector-set! v i n) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 41:2 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 44:2 (vector-set! v i n) -- vector partial bounds checking elimination
-TR info: bounds-check.rkt 47:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 49:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 51:1 displayln -- hidden parameter
-TR opt: bounds-check.rkt 56:2 (flvector-ref v i) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 59:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 62:2 (flvector-ref v i) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 65:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
-TR info: bounds-check.rkt 68:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 70:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 72:1 displayln -- hidden parameter
-
+TR opt: bounds-check.rkt 34:2 (vector-ref v i) -- vector partial bounds checking elimination
+TR opt: bounds-check.rkt 37:2 (vector-set! v i n) -- vector partial bounds checking elimination
+TR opt: bounds-check.rkt 40:2 (vector-ref v i) -- vector partial bounds checking elimination
+TR opt: bounds-check.rkt 43:2 (vector-set! v i n) -- vector partial bounds checking elimination
+TR info: bounds-check.rkt 46:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 48:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 50:1 displayln -- hidden parameter
+TR opt: bounds-check.rkt 55:2 (flvector-ref v i) -- flvector partial bounds checking elimination
+TR opt: bounds-check.rkt 58:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
+TR opt: bounds-check.rkt 61:2 (flvector-ref v i) -- flvector partial bounds checking elimination
+TR opt: bounds-check.rkt 64:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
+TR info: bounds-check.rkt 67:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 69:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 71:1 displayln -- hidden parameter
 END
 #<<END
 3
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt
index f25cc0c7..eb118744 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: box.rkt 21:0 (unbox x) -- box
-TR opt: box.rkt 22:0 (set-box! x 2) -- box
-TR opt: box.rkt 23:0 (unbox x) -- box
-
+TR opt: box.rkt 20:0 (unbox x) -- box
+TR opt: box.rkt 21:0 (set-box! x 2) -- box
+TR opt: box.rkt 22:0 (unbox x) -- box
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt
index f9788627..6ccc8e21 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt
@@ -1,14 +1,13 @@
 #;#;
 #<<END
-TR missed opt: case-arrow.rkt 43:15 (- max min) -- all args float-arg-expr, result not Float -- caused by: 43:18 max, 43:22 min
-TR info: case-arrow.rkt 43:15 (- max min) -- exact real arith
-TR missed opt: case-arrow.rkt 43:12 (* (- max min) x) -- all args float-arg-expr, result not Float -- caused by: 43:15 (- max min), 43:27 x
-TR info: case-arrow.rkt 43:12 (* (- max min) x) -- exact real arith
-TR missed opt: case-arrow.rkt 43:9 (/ (* (- max min) x) p) -- all args float-arg-expr, result not Float -- caused by: 43:12 (* (- max min) x), 43:30 p
-TR info: case-arrow.rkt 43:9 (/ (* (- max min) x) p) -- exact real arith
-TR missed opt: case-arrow.rkt 43:2 (+ min (/ (* (- max min) x) p)) -- all args float-arg-expr, result not Float -- caused by: 43:5 min, 43:9 (/ (* (- max min) x) p)
-TR info: case-arrow.rkt 43:2 (+ min (/ (* (- max min) x) p)) -- exact real arith
-
+TR missed opt: case-arrow.rkt 42:15 (- max min) -- all args float-arg-expr, result not Float -- caused by: 42:18 max, 42:22 min
+TR info: case-arrow.rkt 42:15 (- max min) -- exact real arith
+TR missed opt: case-arrow.rkt 42:12 (* (- max min) x) -- all args float-arg-expr, result not Float -- caused by: 42:15 (- max min), 42:27 x
+TR info: case-arrow.rkt 42:12 (* (- max min) x) -- exact real arith
+TR missed opt: case-arrow.rkt 42:9 (/ (* (- max min) x) p) -- all args float-arg-expr, result not Float -- caused by: 42:12 (* (- max min) x), 42:30 p
+TR info: case-arrow.rkt 42:9 (/ (* (- max min) x) p) -- exact real arith
+TR missed opt: case-arrow.rkt 42:2 (+ min (/ (* (- max min) x) p)) -- all args float-arg-expr, result not Float -- caused by: 42:5 min, 42:9 (/ (* (- max min) x) p)
+TR info: case-arrow.rkt 42:2 (+ min (/ (* (- max min) x) p)) -- exact real arith
 END
 ""
 #lang typed/racket
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt
index bc8b1fb0..61306c26 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: case-lambda-dead-branch.rkt 14:5 (x y) -- dead case-lambda branch
-TR opt: case-lambda-dead-branch.rkt 20:5 (x y) -- dead case-lambda branch
-
+TR opt: case-lambda-dead-branch.rkt 13:5 (x y) -- dead case-lambda branch
+TR opt: case-lambda-dead-branch.rkt 19:5 (x y) -- dead case-lambda branch
 END
 ""
 #lang typed/racket
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt
index bcff876d..571d243c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt
@@ -1,10 +1,9 @@
 #;#;
 #<<END
-TR opt: complex-exp.rkt 16:8 0 -- float-arg-expr in complex ops
-TR opt: complex-exp.rkt 16:3 (exp 0) -- unboxed unary float complex
-TR opt: complex-exp.rkt 16:11 1.0+2.0i -- unboxed literal
-TR opt: complex-exp.rkt 16:0 (- (exp 0) 1.0+2.0i) -- unboxed binary float complex
-
+TR opt: complex-exp.rkt 15:8 0 -- float-arg-expr in complex ops
+TR opt: complex-exp.rkt 15:3 (exp 0) -- unboxed unary float complex
+TR opt: complex-exp.rkt 15:11 1.0+2.0i -- unboxed literal
+TR opt: complex-exp.rkt 15:0 (- (exp 0) 1.0+2.0i) -- unboxed binary float complex
 END
 #<<END
 0.0-2.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt
index 06a907ca..5aacfb0a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt
@@ -1,6 +1,5 @@
 #;#;
 #<<END
-
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt
index e81168cf..f3b3164c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: cross-module-struct2.rkt 15:0 (x-x a) -- struct ref
-
+TR opt: cross-module-struct2.rkt 14:0 (x-x a) -- struct ref
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-else.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-else.rkt
index 705a002d..f9ca0ca6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-else.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-else.rkt
@@ -1,12 +1,11 @@
 #;#;
 #<<END
-TR info: dead-else.rkt 14:1 display -- hidden parameter
-TR opt: dead-else.rkt 16:13 (+ 4.0 5.0) -- dead else branch
-TR opt: dead-else.rkt 15:13 (+ 2.0 3.0) -- binary float
-TR info: dead-else.rkt 17:1 display -- hidden parameter
-TR opt: dead-else.rkt 19:13 (+ 4.0 5.0) -- dead else branch
-TR opt: dead-else.rkt 18:13 (+ 2.0 3.0) -- binary float
-
+TR info: dead-else.rkt 13:1 display -- hidden parameter
+TR opt: dead-else.rkt 15:13 (+ 4.0 5.0) -- dead else branch
+TR opt: dead-else.rkt 14:13 (+ 2.0 3.0) -- binary float
+TR info: dead-else.rkt 16:1 display -- hidden parameter
+TR opt: dead-else.rkt 18:13 (+ 4.0 5.0) -- dead else branch
+TR opt: dead-else.rkt 17:13 (+ 2.0 3.0) -- binary float
 END
 "5.05.0"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt
index ae3e3d98..6965a5d1 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt
@@ -1,66 +1,65 @@
 #;#;
 #<<END
-TR opt: dead-inf-comp.rkt 109:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 111:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 114:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 118:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 122:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 124:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 127:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 131:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 135:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 137:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 140:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 144:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 148:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 150:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 153:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 157:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 162:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 160:4 (< rat +inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 164:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 163:4 (< +inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 167:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 166:4 (< rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 171:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 169:4 (< -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 175:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 173:4 (> +inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 177:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 176:4 (> rat +inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 180:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 179:4 (> -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 184:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 182:4 (> rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 188:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 186:4 (<= rat +inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 190:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 189:4 (<= +inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 193:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 192:4 (<= rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 197:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 195:4 (<= -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 201:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 199:4 (>= +inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 203:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 202:4 (>= rat +inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 206:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 205:4 (>= -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 210:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 208:4 (>= rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 103:0 #%module-begin -- in-range
-TR opt: dead-inf-comp.rkt 103:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 103:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 103:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 213:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 213:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR info: dead-inf-comp.rkt 213:41 displayln -- hidden parameter
-TR opt: dead-inf-comp.rkt 213:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 213:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 213:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR info: dead-inf-comp.rkt 213:41 displayln -- hidden parameter
-TR opt: dead-inf-comp.rkt 213:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-
+TR opt: dead-inf-comp.rkt 108:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 110:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 113:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 117:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 121:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 123:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 126:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 130:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 134:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 136:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 139:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 143:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 147:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 149:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 152:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 156:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 161:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 159:4 (< rat +inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 163:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 162:4 (< +inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 166:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 165:4 (< rat -inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 170:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 168:4 (< -inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 174:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 172:4 (> +inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 176:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 175:4 (> rat +inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 179:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 178:4 (> -inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 183:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 181:4 (> rat -inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 187:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 185:4 (<= rat +inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 189:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 188:4 (<= +inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 192:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 191:4 (<= rat -inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 196:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 194:4 (<= -inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 200:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 198:4 (>= +inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 202:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 201:4 (>= rat +inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 205:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 204:4 (>= -inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 209:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 207:4 (>= rat -inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- in-range
+TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- dead else branch
+TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- dead else branch
+TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- dead else branch
+TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR info: dead-inf-comp.rkt 212:41 displayln -- hidden parameter
+TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR info: dead-inf-comp.rkt 212:41 displayln -- hidden parameter
+TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
 END
 #<<END
 'live
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt
index ba0d509c..92179a83 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR info: dead-substructs.rkt 29:4 make-child1 -- struct constructor
-TR info: dead-substructs.rkt 30:4 make-child2 -- struct constructor
-
+TR info: dead-substructs.rkt 28:4 make-child1 -- struct constructor
+TR info: dead-substructs.rkt 29:4 make-child2 -- struct constructor
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-then.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-then.rkt
index b0379788..1d7d559e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-then.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-then.rkt
@@ -1,12 +1,11 @@
 #;#;
 #<<END
-TR info: dead-then.rkt 14:1 display -- hidden parameter
-TR opt: dead-then.rkt 15:13 (+ 2.0 3.0) -- dead then branch
-TR opt: dead-then.rkt 16:13 (+ 4.0 5.0) -- binary float
-TR info: dead-then.rkt 17:1 display -- hidden parameter
-TR opt: dead-then.rkt 18:13 (+ 2.0 3.0) -- dead then branch
-TR opt: dead-then.rkt 19:13 (+ 4.0 5.0) -- binary float
-
+TR info: dead-then.rkt 13:1 display -- hidden parameter
+TR opt: dead-then.rkt 14:13 (+ 2.0 3.0) -- dead then branch
+TR opt: dead-then.rkt 15:13 (+ 4.0 5.0) -- binary float
+TR info: dead-then.rkt 16:1 display -- hidden parameter
+TR opt: dead-then.rkt 17:13 (+ 2.0 3.0) -- dead then branch
+TR opt: dead-then.rkt 18:13 (+ 4.0 5.0) -- binary float
 END
 "9.09.0"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt
index 64bad43c..673a3cc4 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR info: define-begin-float.rkt 12:18 display -- hidden parameter
-TR opt: define-begin-float.rkt 12:26 (- 2.0 3.0) -- binary float
-TR opt: define-begin-float.rkt 13:17 (* 2.0 3.0) -- binary float
-
+TR info: define-begin-float.rkt 11:18 display -- hidden parameter
+TR opt: define-begin-float.rkt 11:26 (- 2.0 3.0) -- binary float
+TR opt: define-begin-float.rkt 12:17 (* 2.0 3.0) -- binary float
 END
 "-1.0"
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt
index e8d49d1d..a63a0df8 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: define-call-float.rkt 11:16 (+ 1.0 2.0) -- binary float
-
+TR opt: define-call-float.rkt 10:16 (+ 1.0 2.0) -- binary float
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt
index 591e730c..fa53218d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: define-float.rkt 11:10 (+ 1.0 2.0) -- binary float
-
+TR opt: define-float.rkt 10:10 (+ 1.0 2.0) -- binary float
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt
index 28d1edad..1374551d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: define-pair.rkt 11:10 (car (quote (1 3))) -- pair
-
+TR opt: define-pair.rkt 10:10 (car (quote (1 3))) -- pair
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt
index de520b19..1455561b 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt
@@ -1,14 +1,13 @@
 #;#;
 #<<END
-TR opt: derived-pair.rkt 23:0 (caar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 23:0 (caar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 24:0 (cadr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 24:0 (cadr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 25:0 (cdar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 25:0 (cdar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 26:0 (cddr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 26:0 (cddr (cons 1 (cons 2 3))) -- pair
-
+TR opt: derived-pair.rkt 22:0 (caar (cons (cons 1 2) 3)) -- pair
+TR opt: derived-pair.rkt 22:0 (caar (cons (cons 1 2) 3)) -- pair
+TR opt: derived-pair.rkt 23:0 (cadr (cons 1 (cons 2 3))) -- pair
+TR opt: derived-pair.rkt 23:0 (cadr (cons 1 (cons 2 3))) -- pair
+TR opt: derived-pair.rkt 24:0 (cdar (cons (cons 1 2) 3)) -- pair
+TR opt: derived-pair.rkt 24:0 (cdar (cons (cons 1 2) 3)) -- pair
+TR opt: derived-pair.rkt 25:0 (cddr (cons 1 (cons 2 3))) -- pair
+TR opt: derived-pair.rkt 25:0 (cddr (cons 1 (cons 2 3))) -- pair
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt
index 4165e9a3..ea12dc4d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt
@@ -1,30 +1,29 @@
 #;#;
 #<<END
-TR opt: derived-pair2.rkt 43:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 43:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 43:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 44:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 44:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 44:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 45:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 45:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 45:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 46:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 46:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 46:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 47:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 47:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 47:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 48:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 48:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 48:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 49:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 49:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 49:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 50:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 50:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 50:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-
+TR opt: derived-pair2.rkt 42:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 42:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 42:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 43:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 43:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 43:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 44:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 44:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 44:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 45:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
+TR opt: derived-pair2.rkt 45:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
+TR opt: derived-pair2.rkt 45:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
+TR opt: derived-pair2.rkt 46:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 46:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 46:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 47:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 47:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 47:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 48:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 48:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 48:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 49:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
+TR opt: derived-pair2.rkt 49:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
+TR opt: derived-pair2.rkt 49:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair3.rkt
index eb74adec..a4ef846c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair3.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair3.rkt
@@ -1,70 +1,69 @@
 #;#;
 #<<END
-TR opt: derived-pair3.rkt 91:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 91:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 91:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 91:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 92:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 92:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 92:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 92:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 93:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 93:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 93:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 93:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 94:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 94:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 94:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 94:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 95:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 95:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 95:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 95:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 96:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 96:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 96:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 96:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 97:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 97:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 97:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 97:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 98:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 98:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 98:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 98:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 99:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 99:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 99:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 99:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 100:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 100:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 100:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 100:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 101:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 101:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 101:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 101:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 102:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 102:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 102:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 102:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 104:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 104:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 104:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 104:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 105:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 105:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 105:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 105:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 106:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 106:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 106:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 106:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-
+TR opt: derived-pair3.rkt 90:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 90:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 90:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 90:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 91:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 91:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 91:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 91:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 92:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 92:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 92:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 92:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 93:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 93:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 93:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 93:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 94:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 94:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 94:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 94:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 95:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 95:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 95:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 95:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 96:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 96:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 96:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 96:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 97:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 97:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 97:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 97:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 98:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 98:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 98:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 98:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 99:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 99:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 99:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 99:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt
index 4f18faba..ce9fa145 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR info: different-langs.rkt 15:0 (/ 1 2) -- exact real arith
-
+TR info: different-langs.rkt 14:0 (/ 1 2) -- exact real arith
 END
 #<<END
 1/2
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt
index 46aa17e8..9c399b9b 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: double-float.rkt 14:0 (+ 2.0 2.0 2.0) -- binary float
-
+TR opt: double-float.rkt 13:0 (+ 2.0 2.0 2.0) -- binary float
 END
 #<<END
 6.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/drop-pure-pred.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/drop-pure-pred.rkt
index 1f1a6159..32954b22 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/drop-pure-pred.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/drop-pure-pred.rkt
@@ -2,7 +2,6 @@
 #<<END
 TR opt: drop-pure-pred.rkt 18:6 (list 2) -- dead else branch
 TR opt: drop-pure-pred.rkt 16:6 (exact-integer? x) -- useless pure code
-
 END
 #<<END
 '(1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/exact-inexact.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/exact-inexact.rkt
index c6f2f65b..0593b80e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/exact-inexact.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/exact-inexact.rkt
@@ -1,14 +1,13 @@
 #;#;
 #<<END
-TR opt: exact-inexact.rkt 26:0 (exact->inexact (expt 10 100)) -- int to float
-TR opt: exact-inexact.rkt 27:7 (exact->inexact (expt 2.3 3.2)) -- float to float
-TR opt: exact-inexact.rkt 27:0 (round (exact->inexact (expt 2.3 3.2))) -- unary float
-TR opt: exact-inexact.rkt 28:0 (real->double-flonum (expt 10 100)) -- int to float
-TR opt: exact-inexact.rkt 29:7 (real->double-flonum (expt 2.3 3.2)) -- float to float
-TR opt: exact-inexact.rkt 29:0 (round (real->double-flonum (expt 2.3 3.2))) -- unary float
-TR opt: exact-inexact.rkt 32:0 (exact->inexact (expt 1.0f0 2.0f0)) -- single-float to single-float
-TR opt: exact-inexact.rkt 33:0 (real->single-flonum (expt 1.0f0 2.0f0)) -- single-float to single-float
-
+TR opt: exact-inexact.rkt 25:0 (exact->inexact (expt 10 100)) -- int to float
+TR opt: exact-inexact.rkt 26:7 (exact->inexact (expt 2.3 3.2)) -- float to float
+TR opt: exact-inexact.rkt 26:0 (round (exact->inexact (expt 2.3 3.2))) -- unary float
+TR opt: exact-inexact.rkt 27:0 (real->double-flonum (expt 10 100)) -- int to float
+TR opt: exact-inexact.rkt 28:7 (real->double-flonum (expt 2.3 3.2)) -- float to float
+TR opt: exact-inexact.rkt 28:0 (round (real->double-flonum (expt 2.3 3.2))) -- unary float
+TR opt: exact-inexact.rkt 31:0 (exact->inexact (expt 1.0f0 2.0f0)) -- single-float to single-float
+TR opt: exact-inexact.rkt 32:0 (real->single-flonum (expt 1.0f0 2.0f0)) -- single-float to single-float
 END
 #<<END
 1e+100
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt
index 5d39bb5a..67b00be6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR missed opt: expt.rkt 15:13 (expt (sin 0.25) 1.0) -- unexpected complex type
-TR opt: expt.rkt 15:19 (sin 0.25) -- unary float
-
+TR missed opt: expt.rkt 14:13 (expt (sin 0.25) 1.0) -- unexpected complex type
+TR opt: expt.rkt 14:19 (sin 0.25) -- unary float
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt
index 3f37b64b..200c4af9 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: false-huh-dead-code.rkt 14:16 1 -- dead then branch
-TR opt: false-huh-dead-code.rkt 15:13 1 -- dead then branch
-
+TR opt: false-huh-dead-code.rkt 13:16 1 -- dead then branch
+TR opt: false-huh-dead-code.rkt 14:13 1 -- dead then branch
 END
 #<<END
 2
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-bounded-expr.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-bounded-expr.rkt
index 11a2bcc1..de44c00a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-bounded-expr.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-bounded-expr.rkt
@@ -1,33 +1,32 @@
 #;#;
 #<<END
-TR opt: fixnum-bounded-expr.rkt 70:2 (+ x (sqr y)) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 76:7 (* y y) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 76:2 (- x (* y y)) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 83:2 (+ x y) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 86:2 (+ x y) -- fixnum bounded expr
-TR missed opt: fixnum-bounded-expr.rkt 89:2 (+ x y) -- out of fixnum range
-TR opt: fixnum-bounded-expr.rkt 91:0 (abs 45) -- fixnum fxabs
-TR opt: fixnum-bounded-expr.rkt 94:0 (fx+ 5 2) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 95:5 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 95:16 (* 24 25) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 95:0 (fx+ (+ 34 231) (* 24 25)) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 96:8 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 96:5 (+ (+ 34 231) 23) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 96:0 (fx+ (+ (+ 34 231) 23) -4) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 97:11 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 97:8 (+ (+ 34 231) 23) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 97:0 (fx+ -4 (+ (+ 34 231) 23)) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 98:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 98:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 98:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 98:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 72:2 (+ x (sqr y)) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 78:7 (* y y) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 78:2 (- x (* y y)) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 85:2 (+ x y) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 88:2 (+ x y) -- fixnum bounded expr
+TR missed opt: fixnum-bounded-expr.rkt 91:2 (+ x y) -- out of fixnum range
+TR opt: fixnum-bounded-expr.rkt 93:0 (abs 45) -- fixnum fxabs
+TR opt: fixnum-bounded-expr.rkt 96:0 (fx+ 5 2) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 97:5 (+ 34 231) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 97:16 (* 24 25) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 97:0 (fx+ (+ 34 231) (* 24 25)) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 98:8 (+ 34 231) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 98:5 (+ (+ 34 231) 23) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 98:0 (fx+ (+ (+ 34 231) 23) -4) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 99:11 (+ 34 231) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 99:8 (+ (+ 34 231) 23) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 99:0 (fx+ -4 (+ (+ 34 231) 23)) -- fixnum fx+
 TR opt: fixnum-bounded-expr.rkt 100:5 (+ 300 301) -- fixnum bounded expr
 TR opt: fixnum-bounded-expr.rkt 100:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 100:0 (fx- (+ 300 301) (+ 301 302)) -- fixnum fx-
-TR opt: fixnum-bounded-expr.rkt 103:0 (fx* 4 5) -- fixnum fx*
-TR opt: fixnum-bounded-expr.rkt 106:0 (fxquotient (ann 34 Nonnegative-Fixnum) (ann -4 Negative-Fixnum)) -- fixnum fxquotient
-TR opt: fixnum-bounded-expr.rkt 109:0 (fxabs (ann 64235 Nonnegative-Fixnum)) -- fixnum fxabs
-
+TR opt: fixnum-bounded-expr.rkt 100:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 100:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 102:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 102:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 102:0 (fx- (+ 300 301) (+ 301 302)) -- fixnum fx-
+TR opt: fixnum-bounded-expr.rkt 105:0 (fx* 4 5) -- fixnum fx*
+TR opt: fixnum-bounded-expr.rkt 108:0 (fxquotient (ann 34 Nonnegative-Fixnum) (ann -4 Negative-Fixnum)) -- fixnum fxquotient
+TR opt: fixnum-bounded-expr.rkt 111:0 (fxabs (ann 64235 Nonnegative-Fixnum)) -- fixnum fxabs
 END
 #<<END
 28
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-comparison.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-comparison.rkt
index 62a4e8da..394aaf6a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-comparison.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-comparison.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: fixnum-comparison.rkt 16:3 (vector-length (quote #(1 2 3))) -- known-length vector-length
-TR opt: fixnum-comparison.rkt 16:29 (string-length "asdf") -- string-length
-TR opt: fixnum-comparison.rkt 16:0 (< (vector-length (quote #(1 2 3))) (string-length "asdf")) -- binary fixnum comp
-
+TR opt: fixnum-comparison.rkt 15:3 (vector-length (quote #(1 2 3))) -- known-length vector-length
+TR opt: fixnum-comparison.rkt 15:29 (string-length "asdf") -- string-length
+TR opt: fixnum-comparison.rkt 15:0 (< (vector-length (quote #(1 2 3))) (string-length "asdf")) -- binary fixnum comp
 END
 #<<END
 #t
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt
index 10d63141..2ac96547 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: float-comp.rkt 14:0 (< 1.0 2.0) -- binary float comp
-
+TR opt: float-comp.rkt 13:0 (< 1.0 2.0) -- binary float comp
 END
 #<<END
 #t
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate-top.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate-top.rkt
index c5f64fc9..74fef192 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate-top.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate-top.rkt
@@ -1,10 +1,9 @@
 #;#;
 #<<END
-TR opt: float-complex-conjugate-top.rkt 17:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-conjugate-top.rkt 17:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-conjugate-top.rkt 17:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-conjugate-top.rkt 17:0 (conjugate (+ 1.0+2.0i 2.0+4.0i)) -- unboxed unary float complex
-
+TR opt: float-complex-conjugate-top.rkt 16:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-conjugate-top.rkt 16:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-conjugate-top.rkt 16:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-conjugate-top.rkt 16:0 (conjugate (+ 1.0+2.0i 2.0+4.0i)) -- unboxed unary float complex
 END
 #<<END
 3.0-6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate.rkt
index 1c8e3b23..ae081f53 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate.rkt
@@ -1,11 +1,10 @@
 #;#;
 #<<END
-TR opt: float-complex-conjugate.rkt 18:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-conjugate.rkt 18:3 (conjugate 1.0+2.0i) -- unboxed unary float complex
-TR opt: float-complex-conjugate.rkt 18:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-conjugate.rkt 18:24 (conjugate 2.0+4.0i) -- unboxed unary float complex
-TR opt: float-complex-conjugate.rkt 18:0 (+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i)) -- unboxed binary float complex
-
+TR opt: float-complex-conjugate.rkt 17:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-conjugate.rkt 17:3 (conjugate 1.0+2.0i) -- unboxed unary float complex
+TR opt: float-complex-conjugate.rkt 17:35 2.0+4.0i -- unboxed literal
+TR opt: float-complex-conjugate.rkt 17:24 (conjugate 2.0+4.0i) -- unboxed unary float complex
+TR opt: float-complex-conjugate.rkt 17:0 (+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i)) -- unboxed binary float complex
 END
 #<<END
 3.0-6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-div.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-div.rkt
index 9364b920..e65503a7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-div.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-div.rkt
@@ -1,10 +1,9 @@
 #;#;
 #<<END
-TR opt: float-complex-div.rkt 17:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-div.rkt 17:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-div.rkt 17:21 3.0+6.0i -- unboxed literal
-TR opt: float-complex-div.rkt 17:0 (/ 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-
+TR opt: float-complex-div.rkt 16:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-div.rkt 16:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex-div.rkt 16:21 3.0+6.0i -- unboxed literal
+TR opt: float-complex-div.rkt 16:0 (/ 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 END
 #<<END
 0.03333333333333333-0.06666666666666667i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-fixnum.rkt
index 93b78093..2aafdd6b 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-fixnum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-fixnum.rkt
@@ -1,13 +1,12 @@
 #;#;
 #<<END
-TR opt: float-complex-fixnum.rkt 18:3 (modulo 2 1) -- binary nonzero fixnum
-TR opt: float-complex-fixnum.rkt 18:3 (modulo 2 1) -- binary nonzero fixnum
-TR opt: float-complex-fixnum.rkt 18:3 (modulo 2 1) -- binary nonzero fixnum
-TR opt: float-complex-fixnum.rkt 18:3 (modulo 2 1) -- float-arg-expr in complex ops
-TR opt: float-complex-fixnum.rkt 18:16 1.0+2.0i -- unboxed literal
-TR opt: float-complex-fixnum.rkt 18:25 3.0+6.0i -- unboxed literal
-TR opt: float-complex-fixnum.rkt 18:0 (+ (modulo 2 1) 1.0+2.0i 3.0+6.0i) -- unboxed binary float complex
-
+TR opt: float-complex-fixnum.rkt 19:3 (modulo 2 1) -- binary nonzero fixnum
+TR opt: float-complex-fixnum.rkt 19:3 (modulo 2 1) -- binary nonzero fixnum
+TR opt: float-complex-fixnum.rkt 19:3 (modulo 2 1) -- binary nonzero fixnum
+TR opt: float-complex-fixnum.rkt 19:3 (modulo 2 1) -- float-arg-expr in complex ops
+TR opt: float-complex-fixnum.rkt 19:16 1.0+2.0i -- unboxed literal
+TR opt: float-complex-fixnum.rkt 19:25 3.0+6.0i -- unboxed literal
+TR opt: float-complex-fixnum.rkt 19:0 (+ (modulo 2 1) 1.0+2.0i 3.0+6.0i) -- unboxed binary float complex
 END
 #<<END
 4.0+8.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-div.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-div.rkt
index c8047060..278d1750 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-div.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-div.rkt
@@ -1,36 +1,35 @@
 #;#;
 #<<END
+TR opt: float-complex-float-div.rkt 43:62 x -- unbox float-complex
+TR opt: float-complex-float-div.rkt 43:51 (real-part x) -- complex accessor elimination
 TR opt: float-complex-float-div.rkt 44:62 x -- unbox float-complex
-TR opt: float-complex-float-div.rkt 44:51 (real-part x) -- complex accessor elimination
-TR opt: float-complex-float-div.rkt 45:62 x -- unbox float-complex
-TR opt: float-complex-float-div.rkt 45:51 (imag-part x) -- complex accessor elimination
-TR opt: float-complex-float-div.rkt 47:9 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 47:13 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 47:6 (/ 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 48:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 48:18 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 48:6 (/ 1.0+2.0i 2.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 49:9 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 49:13 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 44:51 (imag-part x) -- complex accessor elimination
+TR opt: float-complex-float-div.rkt 46:9 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 46:13 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 46:6 (/ 1.0 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 47:9 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 47:18 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 47:6 (/ 1.0+2.0i 2.0) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 48:9 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 48:13 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 48:22 3.0+6.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 48:6 (/ 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 49:9 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 49:18 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-div.rkt 49:22 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 49:6 (/ 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 49:6 (/ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-float-div.rkt 50:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 50:18 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 50:22 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 50:6 (/ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 50:18 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 50:27 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 50:6 (/ 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
 TR opt: float-complex-float-div.rkt 51:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 51:18 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 51:27 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 51:6 (/ 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 52:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 52:18 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 52:22 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 52:6 (/ 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 53:9 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 53:13 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 53:17 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 53:6 (/ 1.0 2.0 3.0+6.0i) -- unboxed binary float complex
-
+TR opt: float-complex-float-div.rkt 51:18 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 51:22 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 51:6 (/ 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 52:9 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 52:13 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 52:17 3.0+6.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 52:6 (/ 1.0 2.0 3.0+6.0i) -- unboxed binary float complex
 END
 #<<END
 '("0.1000000000-0.2000000000" "0.50000000001.0000000000" "-0.0200000000-0.0266666667" "0.16666666670.0000000000" "0.16666666670.0000000000" "0.16666666670.3333333333" "0.0333333333-0.0666666667")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-mul.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-mul.rkt
index 2378b557..234d8b98 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-mul.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-mul.rkt
@@ -1,28 +1,27 @@
 #;#;
 #<<END
-TR opt: float-complex-float-mul.rkt 40:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 40:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 40:0 (* 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 41:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 41:12 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 41:0 (* 1.0+2.0i 2.0) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 42:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 42:7 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 39:3 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 39:7 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 39:0 (* 1.0 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 40:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 40:12 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 40:0 (* 1.0+2.0i 2.0) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 41:3 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 41:7 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 41:16 3.0+6.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 41:0 (* 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 42:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 42:12 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-mul.rkt 42:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 42:0 (* 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 42:0 (* 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-float-mul.rkt 43:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 43:12 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 43:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 43:0 (* 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 43:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 43:21 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 43:0 (* 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
 TR opt: float-complex-float-mul.rkt 44:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 44:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 44:21 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 44:0 (* 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 45:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 45:12 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 45:16 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 45:0 (* 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
-
+TR opt: float-complex-float-mul.rkt 44:12 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 44:16 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 44:0 (* 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
 END
 #<<END
 2.0+4.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-small.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-small.rkt
index 96c24d86..1b246588 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-small.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-small.rkt
@@ -1,24 +1,23 @@
 #;#;
 #<<END
-TR opt: float-complex-float-small.rkt 35:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 35:12 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 35:0 (+ 1.0+2.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 36:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 36:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 36:0 (+ 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 37:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 37:12 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 37:0 (- 1.0+2.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 38:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 38:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 38:0 (- 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 39:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 39:15 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 39:19 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 39:12 (+ 1.0 2.0) -- binary float
-TR opt: float-complex-float-small.rkt 39:12 (+ 1.0 2.0) -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 39:0 (+ 1.0+2.0i (+ 1.0 2.0)) -- unboxed binary float complex
-
+TR opt: float-complex-float-small.rkt 34:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 34:12 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 34:0 (+ 1.0+2.0i 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-small.rkt 35:3 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 35:7 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 35:0 (+ 1.0 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-float-small.rkt 36:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 36:12 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 36:0 (- 1.0+2.0i 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-small.rkt 37:3 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 37:7 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 37:0 (- 1.0 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-float-small.rkt 38:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 38:15 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 38:19 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 38:12 (+ 1.0 2.0) -- binary float
+TR opt: float-complex-float-small.rkt 38:12 (+ 1.0 2.0) -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 38:0 (+ 1.0+2.0i (+ 1.0 2.0)) -- unboxed binary float complex
 END
 #<<END
 4.0+2.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float.rkt
index fb30b72d..a7f0b65f 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float.rkt
@@ -1,22 +1,21 @@
 #;#;
 #<<END
-TR opt: float-complex-float.rkt 32:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float.rkt 32:12 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float.rkt 31:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float.rkt 31:12 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float.rkt 31:16 3.0+6.0i -- unboxed literal
+TR opt: float-complex-float.rkt 31:0 (+ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float.rkt 32:3 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float.rkt 32:7 2.0+4.0i -- unboxed literal
 TR opt: float-complex-float.rkt 32:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 32:0 (+ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 33:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float.rkt 33:7 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float.rkt 32:0 (- 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float.rkt 33:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float.rkt 33:12 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float.rkt 33:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 33:0 (- 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float.rkt 33:0 (- 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-float.rkt 34:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float.rkt 34:12 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float.rkt 34:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 34:0 (- 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 35:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float.rkt 35:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float.rkt 35:21 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float.rkt 35:0 (- 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
-
+TR opt: float-complex-float.rkt 34:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float.rkt 34:21 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float.rkt 34:0 (- 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
 END
 #<<END
 6.0+8.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-i.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-i.rkt
index 4df8dac7..d8f81930 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-i.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-i.rkt
@@ -1,11 +1,10 @@
 #;#;
 #<<END
-TR opt: float-complex-i.rkt 18:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-i.rkt 18:15 0+1.0i -- unboxed literal
-TR opt: float-complex-i.rkt 18:21 2.0+4.0i -- unboxed literal
-TR opt: float-complex-i.rkt 18:12 (* 0+1.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-i.rkt 18:0 (+ 1.0+2.0i (* 0+1.0i 2.0+4.0i)) -- unboxed binary float complex
-
+TR opt: float-complex-i.rkt 17:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-i.rkt 17:15 0+1.0i -- unboxed literal
+TR opt: float-complex-i.rkt 17:21 2.0+4.0i -- unboxed literal
+TR opt: float-complex-i.rkt 17:12 (* 0+1.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-i.rkt 17:0 (+ 1.0+2.0i (* 0+1.0i 2.0+4.0i)) -- unboxed binary float complex
 END
 #<<END
 -3.0+4.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-integer.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-integer.rkt
index 92850d87..c9dbb849 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-integer.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-integer.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: float-complex-integer.rkt 16:3 (expt 2 100) -- float-arg-expr in complex ops
-TR opt: float-complex-integer.rkt 16:16 1.0+2.0i -- unboxed literal
-TR opt: float-complex-integer.rkt 16:0 (+ (expt 2 100) 1.0+2.0i) -- unboxed binary float complex
-
+TR opt: float-complex-integer.rkt 15:3 (expt 2 100) -- float-arg-expr in complex ops
+TR opt: float-complex-integer.rkt 15:16 1.0+2.0i -- unboxed literal
+TR opt: float-complex-integer.rkt 15:0 (+ (expt 2 100) 1.0+2.0i) -- unboxed binary float complex
 END
 #<<END
 1.2676506002282294e+30+2.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-mult.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-mult.rkt
index 46085024..c01cacca 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-mult.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-mult.rkt
@@ -1,10 +1,9 @@
 #;#;
 #<<END
-TR opt: float-complex-mult.rkt 17:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 17:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 17:21 3.0+6.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 17:0 (* 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-
+TR opt: float-complex-mult.rkt 16:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-mult.rkt 16:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex-mult.rkt 16:21 3.0+6.0i -- unboxed literal
+TR opt: float-complex-mult.rkt 16:0 (* 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 END
 #<<END
 -66.0-12.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts.rkt
index 1669f736..d49727c4 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts.rkt
@@ -1,12 +1,11 @@
 #;#;
 #<<END
+TR opt: float-complex-parts.rkt 20:11 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts.rkt 20:0 (real-part 1.0+2.0i) -- complex accessor elimination
 TR opt: float-complex-parts.rkt 21:11 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts.rkt 21:0 (real-part 1.0+2.0i) -- complex accessor elimination
+TR opt: float-complex-parts.rkt 21:0 (imag-part 1.0+2.0i) -- complex accessor elimination
 TR opt: float-complex-parts.rkt 22:11 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts.rkt 22:0 (imag-part 1.0+2.0i) -- complex accessor elimination
-TR opt: float-complex-parts.rkt 23:11 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts.rkt 23:0 (real-part 1.0+2.0i) -- complex accessor elimination
-
+TR opt: float-complex-parts.rkt 22:0 (real-part 1.0+2.0i) -- complex accessor elimination
 END
 #<<END
 1.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts2.rkt
index eee4ccea..c5ba27c3 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts2.rkt
@@ -1,34 +1,33 @@
 #;#;
 #<<END
-TR opt: float-complex-parts2.rkt 34:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 34:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 34:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 34:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 34:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 34:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 34:0 (real-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 35:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 35:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 35:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 35:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 35:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 35:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 35:0 (unsafe-flreal-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 36:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 36:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 36:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 36:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 36:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 36:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 36:0 (imag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 37:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 37:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 37:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 37:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 37:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 37:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 37:0 (unsafe-flimag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-
+TR opt: float-complex-parts2.rkt 45:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 45:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 45:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 45:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 45:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 45:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 45:0 (real-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
+TR opt: float-complex-parts2.rkt 46:23 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 46:32 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 46:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 46:23 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 46:32 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 46:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 46:0 (unsafe-flreal-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
+TR opt: float-complex-parts2.rkt 47:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 47:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 47:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 47:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 47:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 47:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 47:0 (imag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
+TR opt: float-complex-parts2.rkt 48:23 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 48:32 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 48:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 48:23 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 48:32 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 48:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 48:0 (unsafe-flimag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
 END
 #<<END
 3.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts3.rkt
index b3f82aeb..dfa8be66 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts3.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts3.rkt
@@ -1,30 +1,29 @@
 #;#;
 #<<END
+TR opt: float-complex-parts3.rkt 41:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 41:26 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 41:35 3.0+6.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 41:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 41:12 (real-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
+TR opt: float-complex-parts3.rkt 41:0 (+ 1.0+2.0i (real-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 42:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 42:35 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 42:44 3.0+6.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 42:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 42:12 (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
+TR opt: float-complex-parts3.rkt 42:0 (+ 1.0+2.0i (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 43:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 43:26 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 43:35 3.0+6.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 43:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 43:12 (imag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
+TR opt: float-complex-parts3.rkt 43:0 (+ 1.0+2.0i (imag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
 TR opt: float-complex-parts3.rkt 44:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 44:26 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 44:35 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 44:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 44:12 (real-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 44:0 (+ 1.0+2.0i (real-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 45:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 45:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 45:44 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 45:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 45:12 (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 45:0 (+ 1.0+2.0i (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 46:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 46:26 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 46:35 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 46:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 46:12 (imag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 46:0 (+ 1.0+2.0i (imag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 47:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 47:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 47:44 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 47:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 47:12 (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 47:0 (+ 1.0+2.0i (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
-
+TR opt: float-complex-parts3.rkt 44:35 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 44:44 3.0+6.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 44:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 44:12 (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
+TR opt: float-complex-parts3.rkt 44:0 (+ 1.0+2.0i (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
 END
 #<<END
 6.0+2.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-sin.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-sin.rkt
index c5f23032..da9f8ea8 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-sin.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-sin.rkt
@@ -1,17 +1,16 @@
 #;#;
 #<<END
-TR missed opt: float-complex-sin.rkt 22:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 22:21 t
-TR info: float-complex-sin.rkt 22:18 (* t 6.28) -- exact real arith
-TR missed opt: float-complex-sin.rkt 22:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 22:18 (* t 6.28)
-TR info: float-complex-sin.rkt 22:13 (sin (* t 6.28)) -- exact real arith
-TR missed opt: float-complex-sin.rkt 22:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 22:21 t
-TR info: float-complex-sin.rkt 22:18 (* t 6.28) -- exact real arith
-TR missed opt: float-complex-sin.rkt 22:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 22:18 (* t 6.28)
-TR info: float-complex-sin.rkt 22:13 (sin (* t 6.28)) -- exact real arith
-TR opt: float-complex-sin.rkt 22:13 (sin (* t 6.28)) -- float-arg-expr in complex ops
-TR opt: float-complex-sin.rkt 22:30 0.0+0.0i -- unboxed literal
-TR opt: float-complex-sin.rkt 22:10 (+ (sin (* t 6.28)) 0.0+0.0i) -- unboxed binary float complex
-
+TR missed opt: float-complex-sin.rkt 25:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 25:21 t
+TR info: float-complex-sin.rkt 25:18 (* t 6.28) -- exact real arith
+TR missed opt: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 25:18 (* t 6.28)
+TR info: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- exact real arith
+TR missed opt: float-complex-sin.rkt 25:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 25:21 t
+TR info: float-complex-sin.rkt 25:18 (* t 6.28) -- exact real arith
+TR missed opt: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 25:18 (* t 6.28)
+TR info: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- exact real arith
+TR opt: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- float-arg-expr in complex ops
+TR opt: float-complex-sin.rkt 25:30 0.0+0.0i -- unboxed literal
+TR opt: float-complex-sin.rkt 25:10 (+ (sin (* t 6.28)) 0.0+0.0i) -- unboxed binary float complex
 END
 #<<END
 -0.0031853017931379904+0.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt
index eb4da9f2..10e2e674 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt
@@ -1,12 +1,11 @@
 #;#;
 #<<END
+TR opt: float-complex.rkt 19:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex.rkt 19:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex.rkt 19:0 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 TR opt: float-complex.rkt 20:3 1.0+2.0i -- unboxed literal
 TR opt: float-complex.rkt 20:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex.rkt 20:0 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex.rkt 21:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex.rkt 21:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex.rkt 21:0 (- 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-
+TR opt: float-complex.rkt 20:0 (- 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt
index 4b4cc04d..4119b851 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: float-fun.rkt 14:2 (+ x 1.0) -- binary float
-
+TR opt: float-fun.rkt 13:2 (+ x 1.0) -- binary float
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-promotion.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-promotion.rkt
index c60fe001..f783285d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-promotion.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-promotion.rkt
@@ -4,7 +4,6 @@ TR opt: float-promotion.rkt 17:11 (modulo 1 2) -- binary nonzero fixnum
 TR opt: float-promotion.rkt 17:11 (modulo 1 2) -- binary nonzero fixnum
 TR opt: float-promotion.rkt 17:0 (+ (assert (modulo 1 2) exact-positive-integer?) 2.0) -- binary float
 TR opt: float-promotion.rkt 18:0 (+ (expt 100 100) 2.0) -- binary float
-
 END
 #<<END
 3.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-real.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-real.rkt
index 1edd0d42..a5f54dc0 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-real.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-real.rkt
@@ -1,14 +1,13 @@
 #;#;
 #<<END
-TR opt: float-real.rkt 22:0 (+ 2.3 (ann 3 Positive-Real)) -- binary float
-TR missed opt: float-real.rkt 23:15 (* (ann 2 Integer) 3.2) -- all args float-arg-expr, result not Float -- caused by: 23:23 2
-TR info: float-real.rkt 23:15 (* (ann 2 Integer) 3.2) -- exact real arith
-TR opt: float-real.rkt 23:0 (+ 2.3 (assert (* (ann 2 Integer) 3.2) positive?)) -- binary float
-TR missed opt: float-real.rkt 24:7 (* (ann 2 Integer) 3.1) -- all args float-arg-expr, result not Float -- caused by: 24:15 2
-TR info: float-real.rkt 24:7 (* (ann 2 Integer) 3.1) -- exact real arith
-TR missed opt: float-real.rkt 24:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- all args float-arg-expr, result not Float -- caused by: 24:7 (* (ann 2 Integer) 3.1)
-TR info: float-real.rkt 24:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- exact real arith
-
+TR opt: float-real.rkt 21:0 (+ 2.3 (ann 3 Positive-Real)) -- binary float
+TR missed opt: float-real.rkt 22:15 (* (ann 2 Integer) 3.2) -- all args float-arg-expr, result not Float -- caused by: 22:23 2
+TR info: float-real.rkt 22:15 (* (ann 2 Integer) 3.2) -- exact real arith
+TR opt: float-real.rkt 22:0 (+ 2.3 (assert (* (ann 2 Integer) 3.2) positive?)) -- binary float
+TR missed opt: float-real.rkt 23:7 (* (ann 2 Integer) 3.1) -- all args float-arg-expr, result not Float -- caused by: 23:15 2
+TR info: float-real.rkt 23:7 (* (ann 2 Integer) 3.1) -- exact real arith
+TR missed opt: float-real.rkt 23:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- all args float-arg-expr, result not Float -- caused by: 23:7 (* (ann 2 Integer) 3.1)
+TR info: float-real.rkt 23:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- exact real arith
 END
 #<<END
 5.3
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt
index 293260a5..b7ba4376 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: flvector-length.rkt 14:0 (flvector-length (flvector 0.0 1.2)) -- flvector-length
-
+TR opt: flvector-length.rkt 13:0 (flvector-length (flvector 0.0 1.2)) -- flvector-length
 END
 #<<END
 2
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt
index 3a7ed3b1..b7d41552 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: fx-fl.rkt 14:0 (exact->inexact 1) -- fixnum to float
-
+TR opt: fx-fl.rkt 13:0 (exact->inexact 1) -- fixnum to float
 END
 #<<END
 1.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-bytes.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-bytes.rkt
index 3a623b71..336756f4 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-bytes.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-bytes.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: in-bytes.rkt 9:0 #%module-begin -- in-bytes
-TR info: in-bytes.rkt 12:7 display -- hidden parameter
-TR info: in-bytes.rkt 12:7 display -- hidden parameter
-
+TR opt: in-bytes.rkt 8:0 #%module-begin -- in-bytes
+TR info: in-bytes.rkt 11:7 display -- hidden parameter
+TR info: in-bytes.rkt 11:7 display -- hidden parameter
 END
 "495051"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt
index 6a6994dd..8e8aff90 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: in-list.rkt 9:0 #%module-begin -- in-list
-TR info: in-list.rkt 12:7 display -- hidden parameter
-TR info: in-list.rkt 12:7 display -- hidden parameter
-
+TR opt: in-list.rkt 8:0 #%module-begin -- in-list
+TR info: in-list.rkt 11:7 display -- hidden parameter
+TR info: in-list.rkt 11:7 display -- hidden parameter
 END
 "123"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt
index 673806fd..7f4e7cca 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: in-range.rkt 9:0 #%module-begin -- in-range
-TR info: in-range.rkt 12:3 display -- hidden parameter
-TR info: in-range.rkt 12:3 display -- hidden parameter
-
+TR opt: in-range.rkt 8:0 #%module-begin -- in-range
+TR info: in-range.rkt 11:3 display -- hidden parameter
+TR info: in-range.rkt 11:3 display -- hidden parameter
 END
 "0123"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt
index 48ffc78d..5e0fb097 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: in-string.rkt 9:0 #%module-begin -- in-string
-TR info: in-string.rkt 12:7 display -- hidden parameter
-TR info: in-string.rkt 12:7 display -- hidden parameter
-
+TR opt: in-string.rkt 8:0 #%module-begin -- in-string
+TR info: in-string.rkt 11:7 display -- hidden parameter
+TR info: in-string.rkt 11:7 display -- hidden parameter
 END
 "123"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt
index fcf9bfa2..6789725f 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: in-vector.rkt 9:0 #%module-begin -- in-vector
-TR info: in-vector.rkt 12:7 display -- hidden parameter
-TR info: in-vector.rkt 12:7 display -- hidden parameter
-
+TR opt: in-vector.rkt 8:0 #%module-begin -- in-vector
+TR info: in-vector.rkt 11:7 display -- hidden parameter
+TR info: in-vector.rkt 11:7 display -- hidden parameter
 END
 "123"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt
index 58a729c8..a30776e8 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR info: invalid-binary-nonzero-fixnum.rkt 12:3 display -- hidden parameter
-
+TR info: invalid-binary-nonzero-fixnum.rkt 11:3 display -- hidden parameter
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt
index 913666a1..35e94164 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR missed opt: invalid-derived-pair.rkt 14:2 (cadr x) -- car/cdr on a potentially empty list -- caused by: 14:2 (cadr x)
-TR missed opt: invalid-derived-pair.rkt 19:6 (cadr x) -- car/cdr on a potentially empty list -- caused by: 19:6 (cadr x)
-
+TR missed opt: invalid-derived-pair.rkt 13:2 (cadr x) -- car/cdr on a potentially empty list -- caused by: 13:2 (cadr x)
+TR missed opt: invalid-derived-pair.rkt 18:6 (cadr x) -- car/cdr on a potentially empty list -- caused by: 18:6 (cadr x)
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt
index bb8e788f..5c4f94b1 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: invalid-exact-inexact.rkt 13:0 (exact->inexact 1.0) -- float to float
-
+TR opt: invalid-exact-inexact.rkt 12:0 (exact->inexact 1.0) -- float to float
 END
 #<<END
 1.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt
index a1bcbfc9..38fa9171 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt
@@ -1,6 +1,5 @@
 #;#;
 #<<END
-
 END
 #<<END
 #t
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-promotion.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-promotion.rkt
index 474d2c61..5fc784f1 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-promotion.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-promotion.rkt
@@ -1,10 +1,9 @@
 #;#;
 #<<END
-TR missed opt: invalid-float-promotion.rkt 17:0 (/ (ann 1 Integer) 2.0) -- all args float-arg-expr, result not Float -- caused by: 17:8 1
-TR info: invalid-float-promotion.rkt 17:0 (/ (ann 1 Integer) 2.0) -- exact real arith
-TR missed opt: invalid-float-promotion.rkt 18:0 (* (ann 2/3 Exact-Rational) 3.0) -- all args float-arg-expr, result not Float -- caused by: 18:8 2/3
-TR info: invalid-float-promotion.rkt 18:0 (* (ann 2/3 Exact-Rational) 3.0) -- exact real arith
-
+TR missed opt: invalid-float-promotion.rkt 16:0 (/ (ann 1 Integer) 2.0) -- all args float-arg-expr, result not Float -- caused by: 16:8 1
+TR info: invalid-float-promotion.rkt 16:0 (/ (ann 1 Integer) 2.0) -- exact real arith
+TR missed opt: invalid-float-promotion.rkt 17:0 (* (ann 2/3 Exact-Rational) 3.0) -- all args float-arg-expr, result not Float -- caused by: 17:8 2/3
+TR info: invalid-float-promotion.rkt 17:0 (* (ann 2/3 Exact-Rational) 3.0) -- exact real arith
 END
 #<<END
 0.5
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt
index 957c5998..4e344a62 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR missed opt: invalid-fxquotient.rkt 16:21 (quotient fixnum-min -1) -- out of fixnum range
-
+TR missed opt: invalid-fxquotient.rkt 15:21 (quotient fixnum-min -1) -- out of fixnum range
 END
 #<<END
 #t
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt
index 5b3a3c82..b2da858a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt
@@ -1,6 +1,5 @@
 #;#;
 #<<END
-
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt
index a11dcf0f..e86e4086 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR missed opt: invalid-log-complex.rkt 14:11 (log (ann 2.0 Float)) -- unexpected complex type
-
+TR missed opt: invalid-log-complex.rkt 13:11 (log (ann 2.0 Float)) -- unexpected complex type
 END
 #<<END
 0.6931471805599453
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt
index a0cdcaad..3b8ba50c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt
@@ -1,6 +1,5 @@
 #;#;
 #<<END
-
 END
 #<<END
 1+2i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt
index c6b77661..7eb7ea49 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt
@@ -1,6 +1,5 @@
 #;#;
 #<<END
-
 END
 #<<END
 0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt
index 9eb7207f..ae8cef02 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR missed opt: invalid-mpair.rkt 12:2 (mcar x) -- car/cdr on a potentially empty list -- caused by: 12:8 x
-
+TR missed opt: invalid-mpair.rkt 11:2 (mcar x) -- car/cdr on a potentially empty list -- caused by: 11:8 x
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt
index 3ec2a8e7..de6d84c3 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR missed opt: invalid-sqrt.rkt 13:0 (sqrt -2.0) -- unexpected complex type
-
+TR missed opt: invalid-sqrt.rkt 12:0 (sqrt -2.0) -- unexpected complex type
 END
 #<<END
 0+1.4142135623730951i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let.rkt
index ecc9b77d..ab811d81 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let.rkt
@@ -1,29 +1,28 @@
 #;#;
 #<<END
-TR opt: invalid-unboxed-let.rkt 37:14 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 37:17 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 37:11 (+ t1 t1) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 37:14 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 37:17 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 37:11 (+ t1 t1) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 37:14 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 37:17 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 37:11 (+ t1 t1) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 33:13 1.0+2.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 33:22 2.0+4.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 33:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 34:13 3.0+6.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 34:22 4.0+8.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 34:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 33:0 (let ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (+ 3.0+6.0i 4.0+8.0i)) (t3 1.0+2.0i) (t4 1)) (display (+ t1 t1)) (display t2) (display t3) (display t4)) -- unboxed let bindings
+TR opt: invalid-unboxed-let.rkt 36:14 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:17 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:11 (+ t1 t1) -- unboxed binary float complex
+TR opt: invalid-unboxed-let.rkt 36:14 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:17 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:11 (+ t1 t1) -- unboxed binary float complex
+TR opt: invalid-unboxed-let.rkt 36:14 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:17 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:11 (+ t1 t1) -- unboxed binary float complex
+TR opt: invalid-unboxed-let.rkt 32:13 1.0+2.0i -- unboxed literal
+TR opt: invalid-unboxed-let.rkt 32:22 2.0+4.0i -- unboxed literal
+TR opt: invalid-unboxed-let.rkt 32:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: invalid-unboxed-let.rkt 33:13 3.0+6.0i -- unboxed literal
+TR opt: invalid-unboxed-let.rkt 33:22 4.0+8.0i -- unboxed literal
+TR opt: invalid-unboxed-let.rkt 33:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
+TR opt: invalid-unboxed-let.rkt 32:0 (let ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (+ 3.0+6.0i 4.0+8.0i)) (t3 1.0+2.0i) (t4 1)) (display (+ t1 t1)) (display t2) (display t3) (display t4)) -- unboxed let bindings
+TR info: invalid-unboxed-let.rkt 36:3 display -- hidden parameter
+TR opt: invalid-unboxed-let.rkt 36:14 t1 -- leave var unboxed
+TR opt: invalid-unboxed-let.rkt 36:17 t1 -- leave var unboxed
+TR opt: invalid-unboxed-let.rkt 36:11 (+ t1 t1) -- unboxed binary float complex
 TR info: invalid-unboxed-let.rkt 37:3 display -- hidden parameter
-TR opt: invalid-unboxed-let.rkt 37:14 t1 -- leave var unboxed
-TR opt: invalid-unboxed-let.rkt 37:17 t1 -- leave var unboxed
-TR opt: invalid-unboxed-let.rkt 37:11 (+ t1 t1) -- unboxed binary float complex
 TR info: invalid-unboxed-let.rkt 38:3 display -- hidden parameter
 TR info: invalid-unboxed-let.rkt 39:3 display -- hidden parameter
-TR info: invalid-unboxed-let.rkt 40:3 display -- hidden parameter
-
 END
 "6.0+12.0i7.0+14.0i1.0+2.0i1"
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt
index c17f7370..e38fe565 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt
@@ -1,15 +1,14 @@
 #;#;
 #<<END
-TR opt: invalid-unboxed-let2.rkt 25:33 1.0+2.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 25:42 2.0+4.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 25:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let2.rkt 25:55 3.0+6.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 25:64 4.0+8.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 25:52 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let2.rkt 26:5 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let2.rkt 26:8 t2 -- unbox float-complex
-TR opt: invalid-unboxed-let2.rkt 26:2 (+ t1 t2) -- unboxed binary float complex
-
+TR opt: invalid-unboxed-let2.rkt 24:33 1.0+2.0i -- unboxed literal
+TR opt: invalid-unboxed-let2.rkt 24:42 2.0+4.0i -- unboxed literal
+TR opt: invalid-unboxed-let2.rkt 24:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: invalid-unboxed-let2.rkt 24:55 3.0+6.0i -- unboxed literal
+TR opt: invalid-unboxed-let2.rkt 24:64 4.0+8.0i -- unboxed literal
+TR opt: invalid-unboxed-let2.rkt 24:52 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
+TR opt: invalid-unboxed-let2.rkt 25:5 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let2.rkt 25:8 t2 -- unbox float-complex
+TR opt: invalid-unboxed-let2.rkt 25:2 (+ t1 t2) -- unboxed binary float complex
 END
 #<<END
 10.0+20.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt
index e8b6afef..d5ea6f94 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: invalid-vector-ref.rkt 12:2 (vector-ref x 0) -- vector partial bounds checking elimination
-
+TR opt: invalid-vector-ref.rkt 11:2 (vector-ref x 0) -- vector partial bounds checking elimination
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt
index 5d047db5..15f5d0e9 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: invalid-vector-set.rkt 12:2 (vector-set! x 0 2) -- vector partial bounds checking elimination
-
+TR opt: invalid-vector-set.rkt 11:2 (vector-set! x 0 2) -- vector partial bounds checking elimination
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt
index e23e3cad..ed25c465 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt
@@ -13,7 +13,6 @@ TR opt: known-length-lists.rkt 51:0 (list-ref l 2) -- known-length list op
 TR opt: known-length-lists.rkt 52:0 (list-tail l 0) -- known-length list op
 TR opt: known-length-lists.rkt 53:0 (list-tail l 1) -- known-length list op
 TR opt: known-length-lists.rkt 54:0 (list-tail l 2) -- known-length list op
-
 END
 #<<END
 '(1 2 3)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-vector-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-vector-length.rkt
index c897256e..053a5712 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-vector-length.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-vector-length.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: known-vector-length.rkt 15:5 (vector-length (ann (vector 1 2) (Vector Integer Integer))) -- known-length vector-length
-TR opt: known-vector-length.rkt 15:0 (+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer)))) -- fixnum bounded expr
-
+TR opt: known-vector-length.rkt 14:5 (vector-length (ann (vector 1 2) (Vector Integer Integer))) -- known-length vector-length
+TR opt: known-vector-length.rkt 14:0 (+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer)))) -- fixnum bounded expr
 END
 #<<END
 4
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt
index b85409e3..56ec6f10 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: let-float.rkt 15:9 (+ 3.0 2.0) -- binary float
-TR opt: let-float.rkt 16:2 (* 9.0 x) -- binary float
-
+TR opt: let-float.rkt 14:9 (+ 3.0 2.0) -- binary float
+TR opt: let-float.rkt 15:2 (* 9.0 x) -- binary float
 END
 #<<END
 45.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt
index 20e23beb..1106d5aa 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: let-rhs.rkt 16:9 (+ 1.0 2.0) -- binary float
-
+TR opt: let-rhs.rkt 15:9 (+ 1.0 2.0) -- binary float
 END
 #<<END
 3.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/list.rkt
index 4bb94472..7e965540 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/list.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/list.rkt
@@ -1,19 +1,18 @@
 #;#;
 #<<END
-TR opt: list.rkt 31:0 (first l) -- pair
-TR opt: list.rkt 32:0 (rest l) -- pair
-TR opt: list.rkt 33:0 (second l) -- pair
-TR opt: list.rkt 33:0 (second l) -- pair
-TR missed opt: list.rkt 34:0 (rest (rest l)) -- car/cdr on a potentially empty list -- caused by: 34:6 (rest l)
-TR opt: list.rkt 34:6 (rest l) -- pair
-TR opt: list.rkt 35:0 (third l) -- pair
-TR opt: list.rkt 35:0 (third l) -- pair
-TR opt: list.rkt 35:0 (third l) -- pair
-TR opt: list.rkt 36:0 (fourth l) -- pair
-TR opt: list.rkt 36:0 (fourth l) -- pair
-TR opt: list.rkt 36:0 (fourth l) -- pair
-TR opt: list.rkt 36:0 (fourth l) -- pair
-
+TR opt: list.rkt 30:0 (first l) -- pair
+TR opt: list.rkt 31:0 (rest l) -- pair
+TR opt: list.rkt 32:0 (second l) -- pair
+TR opt: list.rkt 32:0 (second l) -- pair
+TR missed opt: list.rkt 33:0 (rest (rest l)) -- car/cdr on a potentially empty list -- caused by: 33:6 (rest l)
+TR opt: list.rkt 33:6 (rest l) -- pair
+TR opt: list.rkt 34:0 (third l) -- pair
+TR opt: list.rkt 34:0 (third l) -- pair
+TR opt: list.rkt 34:0 (third l) -- pair
+TR opt: list.rkt 35:0 (fourth l) -- pair
+TR opt: list.rkt 35:0 (fourth l) -- pair
+TR opt: list.rkt 35:0 (fourth l) -- pair
+TR opt: list.rkt 35:0 (fourth l) -- pair
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt
index 4030f813..99d0c5c2 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: literal-int.rkt 17:0 (+ 1 2.0) -- binary float
-
+TR opt: literal-int.rkt 16:0 (+ 1 2.0) -- binary float
 END
 #<<END
 3.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/magnitude.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/magnitude.rkt
index 1c93958b..fee9e12e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/magnitude.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/magnitude.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: magnitude.rkt 17:11 3.0+4.0i -- unboxed literal
-TR opt: magnitude.rkt 17:0 (magnitude 3.0+4.0i) -- unboxed unary float complex
-
+TR opt: magnitude.rkt 16:11 3.0+4.0i -- unboxed literal
+TR opt: magnitude.rkt 16:0 (magnitude 3.0+4.0i) -- unboxed unary float complex
 END
 #<<END
 5.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt
index 2c856e82..68f069e6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: make-flrectangular.rkt 16:0 (make-rectangular 1.0 2.2) -- binary float comp
-TR opt: make-flrectangular.rkt 17:0 (make-flrectangular 1.0 2.2) -- binary float comp
-
+TR opt: make-flrectangular.rkt 15:0 (make-rectangular 1.0 2.2) -- binary float comp
+TR opt: make-flrectangular.rkt 16:0 (make-flrectangular 1.0 2.2) -- binary float comp
 END
 #<<END
 1.0+2.2i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-polar.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-polar.rkt
index 384133c6..2b3c8b4e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-polar.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-polar.rkt
@@ -1,20 +1,19 @@
 #;#;
 #<<END
-TR opt: make-polar.rkt 29:6 (make-polar 1.0 1.0) -- make-rectangular elimination
-TR opt: make-polar.rkt 29:6 (make-polar 1.0 1.0) -- make-polar
-TR opt: make-polar.rkt 33:50 p -- unbox float-complex
-TR opt: make-polar.rkt 33:39 (real-part p) -- unboxed unary float complex
-TR opt: make-polar.rkt 32:12 1.0+2.0i -- unboxed literal
-TR opt: make-polar.rkt 32:21 (make-polar 2.0 4.0) -- make-rectangular elimination
-TR opt: make-polar.rkt 32:9 (+ 1.0+2.0i (make-polar 2.0 4.0)) -- unboxed binary float complex
-TR opt: make-polar.rkt 32:0 (let ((p (+ 1.0+2.0i (make-polar 2.0 4.0)))) (string-append (real->decimal-string (real-part p) 3) (real->decimal-string (imag-part p) 3))) -- unboxed let bindings
-TR opt: make-polar.rkt 33:50 p -- unboxed complex variable
-TR opt: make-polar.rkt 33:50 p -- leave var unboxed
-TR opt: make-polar.rkt 33:39 (real-part p) -- complex accessor elimination
+TR opt: make-polar.rkt 30:6 (make-polar 1.0 1.0) -- make-rectangular elimination
+TR opt: make-polar.rkt 30:6 (make-polar 1.0 1.0) -- make-polar
+TR opt: make-polar.rkt 34:50 p -- unbox float-complex
+TR opt: make-polar.rkt 34:39 (real-part p) -- unboxed unary float complex
+TR opt: make-polar.rkt 33:12 1.0+2.0i -- unboxed literal
+TR opt: make-polar.rkt 33:21 (make-polar 2.0 4.0) -- make-rectangular elimination
+TR opt: make-polar.rkt 33:9 (+ 1.0+2.0i (make-polar 2.0 4.0)) -- unboxed binary float complex
+TR opt: make-polar.rkt 33:0 (let ((p (+ 1.0+2.0i (make-polar 2.0 4.0)))) (string-append (real->decimal-string (real-part p) 3) (real->decimal-string (imag-part p) 3))) -- unboxed let bindings
 TR opt: make-polar.rkt 34:50 p -- unboxed complex variable
 TR opt: make-polar.rkt 34:50 p -- leave var unboxed
-TR opt: make-polar.rkt 34:39 (imag-part p) -- complex accessor elimination
-
+TR opt: make-polar.rkt 34:39 (real-part p) -- complex accessor elimination
+TR opt: make-polar.rkt 35:50 p -- unboxed complex variable
+TR opt: make-polar.rkt 35:50 p -- leave var unboxed
+TR opt: make-polar.rkt 35:39 (imag-part p) -- complex accessor elimination
 END
 #<<END
 "-0.3070.486"
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/maybe-exact-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/maybe-exact-complex.rkt
index eeec8960..8a3c5e4d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/maybe-exact-complex.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/maybe-exact-complex.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: maybe-exact-complex.rkt 18:3 1.0+2.0i -- unboxed literal
-TR opt: maybe-exact-complex.rkt 18:12 2+4i -- unboxed literal
-TR opt: maybe-exact-complex.rkt 18:0 (+ 1.0+2.0i 2+4i) -- unboxed binary float complex
-
+TR opt: maybe-exact-complex.rkt 17:3 1.0+2.0i -- unboxed literal
+TR opt: maybe-exact-complex.rkt 17:12 2+4i -- unboxed literal
+TR opt: maybe-exact-complex.rkt 17:0 (+ 1.0+2.0i 2+4i) -- unboxed binary float complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt
index ea4f5b52..efb228d1 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: module-path.rkt 16:0 (unless (module-path? 2) #f) -- dead then branch
-
+TR opt: module-path.rkt 15:0 (unless (module-path? 2) #f) -- dead then branch
 END
 #<<END
 #t
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt
index ac2446ec..e479353d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt
@@ -1,13 +1,12 @@
 #;#;
 #<<END
-TR opt: mpair.rkt 23:0 (mcar x) -- pair
-TR opt: mpair.rkt 24:0 (mcdr x) -- pair
-TR opt: mpair.rkt 25:0 (set-mcar! x (+ 1 2)) -- pair
-TR opt: mpair.rkt 25:13 (+ 1 2) -- fixnum bounded expr
-TR opt: mpair.rkt 26:0 (set-mcdr! x (+ 1.0 2.0)) -- pair
-TR opt: mpair.rkt 26:13 (+ 1.0 2.0) -- binary float
-TR opt: mpair.rkt 32:6 (mcar x) -- pair
-
+TR opt: mpair.rkt 22:0 (mcar x) -- pair
+TR opt: mpair.rkt 23:0 (mcdr x) -- pair
+TR opt: mpair.rkt 24:0 (set-mcar! x (+ 1 2)) -- pair
+TR opt: mpair.rkt 24:13 (+ 1 2) -- fixnum bounded expr
+TR opt: mpair.rkt 25:0 (set-mcdr! x (+ 1.0 2.0)) -- pair
+TR opt: mpair.rkt 25:13 (+ 1.0 2.0) -- binary float
+TR opt: mpair.rkt 31:6 (mcar x) -- pair
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/multi-flcomp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/multi-flcomp.rkt
index 8eb0b3e0..b7fef766 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/multi-flcomp.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/multi-flcomp.rkt
@@ -1,12 +1,11 @@
 #;#;
 #<<END
-TR opt: multi-flcomp.rkt 22:0 (<= 1.0 2.0 3.0) -- multi float comp
-TR opt: multi-flcomp.rkt 24:0 (<= 1.0 2.0 3.0 4.0) -- multi float comp
-TR opt: multi-flcomp.rkt 25:16 (+ 2.0 2.0) -- binary float
-TR opt: multi-flcomp.rkt 25:0 (<= 1.0 2.0 3.0 (+ 2.0 2.0)) -- multi float comp
-TR opt: multi-flcomp.rkt 26:12 (+ 2.0 2.0) -- binary float
-TR opt: multi-flcomp.rkt 26:0 (<= 1.0 2.0 (+ 2.0 2.0) 3.0) -- multi float comp
-
+TR opt: multi-flcomp.rkt 21:0 (<= 1.0 2.0 3.0) -- multi float comp
+TR opt: multi-flcomp.rkt 23:0 (<= 1.0 2.0 3.0 4.0) -- multi float comp
+TR opt: multi-flcomp.rkt 24:16 (+ 2.0 2.0) -- binary float
+TR opt: multi-flcomp.rkt 24:0 (<= 1.0 2.0 3.0 (+ 2.0 2.0)) -- multi float comp
+TR opt: multi-flcomp.rkt 25:12 (+ 2.0 2.0) -- binary float
+TR opt: multi-flcomp.rkt 25:0 (<= 1.0 2.0 (+ 2.0 2.0) 3.0) -- multi float comp
 END
 #<<END
 #t
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float-complex.rkt
index 66d6fe31..74b62ac3 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float-complex.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float-complex.rkt
@@ -1,11 +1,10 @@
 #;#;
 #<<END
-TR opt: n-ary-float-complex.rkt 18:3 1.0+2.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 18:12 2.0+4.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 18:21 3.0+6.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 18:30 4.0+8.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 18:0 (+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-
+TR opt: n-ary-float-complex.rkt 17:3 1.0+2.0i -- unboxed literal
+TR opt: n-ary-float-complex.rkt 17:12 2.0+4.0i -- unboxed literal
+TR opt: n-ary-float-complex.rkt 17:21 3.0+6.0i -- unboxed literal
+TR opt: n-ary-float-complex.rkt 17:30 4.0+8.0i -- unboxed literal
+TR opt: n-ary-float-complex.rkt 17:0 (+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
 END
 #<<END
 10.0+20.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt
index 1e5db5d8..579a8320 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: n-ary-float.rkt 14:0 (+ 1.0 2.0 3.0) -- binary float
-
+TR opt: n-ary-float.rkt 13:0 (+ 1.0 2.0 3.0) -- binary float
 END
 #<<END
 6.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float-complex.rkt
index 861a150d..d361e347 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float-complex.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float-complex.rkt
@@ -1,11 +1,10 @@
 #;#;
 #<<END
-TR opt: nested-float-complex.rkt 18:3 1.0+2.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 18:15 2.0+4.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 18:24 3.0+6.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 18:12 (- 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: nested-float-complex.rkt 18:0 (+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i)) -- unboxed binary float complex
-
+TR opt: nested-float-complex.rkt 17:3 1.0+2.0i -- unboxed literal
+TR opt: nested-float-complex.rkt 17:15 2.0+4.0i -- unboxed literal
+TR opt: nested-float-complex.rkt 17:24 3.0+6.0i -- unboxed literal
+TR opt: nested-float-complex.rkt 17:12 (- 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: nested-float-complex.rkt 17:0 (+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i)) -- unboxed binary float complex
 END
 #<<END
 0.0+0.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float.rkt
index 48e9d4aa..51e3395a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: nested-float.rkt 15:7 (+ 3.0 4.0) -- binary float
-TR opt: nested-float.rkt 15:0 (+ 2.0 (+ 3.0 4.0)) -- binary float
-
+TR opt: nested-float.rkt 14:7 (+ 3.0 4.0) -- binary float
+TR opt: nested-float.rkt 14:0 (+ 2.0 (+ 3.0 4.0)) -- binary float
 END
 #<<END
 9.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float2.rkt
index c60a9512..6c4cc471 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float2.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: nested-float2.rkt 15:7 (* 3.0 4.0) -- binary float
-TR opt: nested-float2.rkt 15:0 (+ 2.0 (* 3.0 4.0)) -- binary float
-
+TR opt: nested-float2.rkt 14:7 (* 3.0 4.0) -- binary float
+TR opt: nested-float2.rkt 14:0 (+ 2.0 (* 3.0 4.0)) -- binary float
 END
 #<<END
 14.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-let-loop.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-let-loop.rkt
index 3f8c2256..9106f46c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-let-loop.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-let-loop.rkt
@@ -1,38 +1,37 @@
 #;#;
 #<<END
-TR opt: nested-let-loop.rkt 54:38 r -- unbox float-complex
-TR opt: nested-let-loop.rkt 54:40 s -- unbox float-complex
-TR opt: nested-let-loop.rkt 54:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 47:8 r -- unboxed var -> table
-TR opt: nested-let-loop.rkt 45:6 loop1 -- fun -> unboxed fun
-TR opt: nested-let-loop.rkt 49:10 r -- unboxed complex variable
-TR opt: nested-let-loop.rkt 54:38 r -- leave var unboxed
-TR opt: nested-let-loop.rkt 54:40 s -- unbox float-complex
-TR opt: nested-let-loop.rkt 54:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 52:18 s -- unboxed var -> table
-TR opt: nested-let-loop.rkt 50:16 loop2 -- fun -> unboxed fun
-TR opt: nested-let-loop.rkt 54:38 r -- leave var unboxed
-TR opt: nested-let-loop.rkt 54:40 s -- leave var unboxed
-TR opt: nested-let-loop.rkt 54:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 54:20 (loop1 (cdr x) (+ r s)) -- unboxed call site
-TR opt: nested-let-loop.rkt 54:27 (cdr x) -- pair
-TR opt: nested-let-loop.rkt 54:20 (loop1 (cdr x) (+ r s)) -- call to fun with unboxed args
-TR opt: nested-let-loop.rkt 55:38 s -- leave var unboxed
-TR opt: nested-let-loop.rkt 55:40 (car x) -- unbox float-complex
-TR opt: nested-let-loop.rkt 55:40 (car x) -- pair
-TR opt: nested-let-loop.rkt 55:48 (car y) -- unbox float-complex
-TR opt: nested-let-loop.rkt 55:48 (car y) -- pair
-TR opt: nested-let-loop.rkt 55:35 (+ s (car x) (car y)) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 55:20 (loop2 (cdr y) (+ s (car x) (car y))) -- unboxed call site
-TR opt: nested-let-loop.rkt 55:27 (cdr y) -- pair
-TR opt: nested-let-loop.rkt 55:20 (loop2 (cdr y) (+ s (car x) (car y))) -- call to fun with unboxed args
-TR opt: nested-let-loop.rkt 52:38 0.0+0.0i -- unboxed literal
-TR opt: nested-let-loop.rkt 50:10 (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))) -- unboxed call site
-TR opt: nested-let-loop.rkt 50:16 loop2 -- unboxed let loop
-TR opt: nested-let-loop.rkt 47:28 0.0+0.0i -- unboxed literal
-TR opt: nested-let-loop.rkt 45:0 (let: loop1 : Float-Complex ((x : (Listof Float-Complex) (quote (1.0+2.0i 2.0+4.0i))) (r : Float-Complex 0.0+0.0i)) (if (null? x) r (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))))) -- unboxed call site
-TR opt: nested-let-loop.rkt 45:6 loop1 -- unboxed let loop
-
+TR opt: nested-let-loop.rkt 53:38 r -- unbox float-complex
+TR opt: nested-let-loop.rkt 53:40 s -- unbox float-complex
+TR opt: nested-let-loop.rkt 53:35 (+ r s) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 46:8 r -- unboxed var -> table
+TR opt: nested-let-loop.rkt 44:6 loop1 -- fun -> unboxed fun
+TR opt: nested-let-loop.rkt 48:10 r -- unboxed complex variable
+TR opt: nested-let-loop.rkt 53:38 r -- leave var unboxed
+TR opt: nested-let-loop.rkt 53:40 s -- unbox float-complex
+TR opt: nested-let-loop.rkt 53:35 (+ r s) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 51:18 s -- unboxed var -> table
+TR opt: nested-let-loop.rkt 49:16 loop2 -- fun -> unboxed fun
+TR opt: nested-let-loop.rkt 53:38 r -- leave var unboxed
+TR opt: nested-let-loop.rkt 53:40 s -- leave var unboxed
+TR opt: nested-let-loop.rkt 53:35 (+ r s) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 53:20 (loop1 (cdr x) (+ r s)) -- unboxed call site
+TR opt: nested-let-loop.rkt 53:27 (cdr x) -- pair
+TR opt: nested-let-loop.rkt 53:20 (loop1 (cdr x) (+ r s)) -- call to fun with unboxed args
+TR opt: nested-let-loop.rkt 54:38 s -- leave var unboxed
+TR opt: nested-let-loop.rkt 54:40 (car x) -- unbox float-complex
+TR opt: nested-let-loop.rkt 54:40 (car x) -- pair
+TR opt: nested-let-loop.rkt 54:48 (car y) -- unbox float-complex
+TR opt: nested-let-loop.rkt 54:48 (car y) -- pair
+TR opt: nested-let-loop.rkt 54:35 (+ s (car x) (car y)) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 54:20 (loop2 (cdr y) (+ s (car x) (car y))) -- unboxed call site
+TR opt: nested-let-loop.rkt 54:27 (cdr y) -- pair
+TR opt: nested-let-loop.rkt 54:20 (loop2 (cdr y) (+ s (car x) (car y))) -- call to fun with unboxed args
+TR opt: nested-let-loop.rkt 51:38 0.0+0.0i -- unboxed literal
+TR opt: nested-let-loop.rkt 49:10 (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))) -- unboxed call site
+TR opt: nested-let-loop.rkt 49:16 loop2 -- unboxed let loop
+TR opt: nested-let-loop.rkt 46:28 0.0+0.0i -- unboxed literal
+TR opt: nested-let-loop.rkt 44:0 (let: loop1 : Float-Complex ((x : (Listof Float-Complex) (quote (1.0+2.0i 2.0+4.0i))) (r : Float-Complex 0.0+0.0i)) (if (null? x) r (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))))) -- unboxed call site
+TR opt: nested-let-loop.rkt 44:6 loop1 -- unboxed let loop
 END
 #<<END
 20.0+40.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt
index fc4c88a9..fa832aa8 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: nested-pair1.rkt 15:0 (car (cdr (quote (1 2)))) -- pair
-TR opt: nested-pair1.rkt 15:5 (cdr (quote (1 2))) -- pair
-
+TR opt: nested-pair1.rkt 14:0 (car (cdr (quote (1 2)))) -- pair
+TR opt: nested-pair1.rkt 14:5 (cdr (quote (1 2))) -- pair
 END
 #<<END
 2
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt
index 9e353394..69f0d694 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: nested-pair2.rkt 15:0 (car (cdr (cons 3 (cons (cons 2 (quote ())) 1)))) -- pair
-TR opt: nested-pair2.rkt 15:5 (cdr (cons 3 (cons (cons 2 (quote ())) 1))) -- pair
-
+TR opt: nested-pair2.rkt 14:0 (car (cdr (cons 3 (cons (cons 2 (quote ())) 1)))) -- pair
+TR opt: nested-pair2.rkt 14:5 (cdr (cons 3 (cons (cons 2 (quote ())) 1))) -- pair
 END
 #<<END
 '(2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-unboxed-let.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-unboxed-let.rkt
index ecfa6dd4..01350a8c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-unboxed-let.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-unboxed-let.rkt
@@ -1,23 +1,22 @@
 #;#;
 #<<END
-TR opt: nested-unboxed-let.rkt 31:14 x -- unbox float-complex
-TR opt: nested-unboxed-let.rkt 31:16 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 31:11 (+ x 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 30:12 1.0+2.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 30:21 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 30:9 (+ 1.0+2.0i 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 30:0 (let ((x (+ 1.0+2.0i 2.0+3.0i))) (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i))) -- unboxed let bindings
-TR opt: nested-unboxed-let.rkt 32:7 x -- unbox float-complex
-TR opt: nested-unboxed-let.rkt 32:9 3.0+6.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 32:4 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 31:14 x -- leave var unboxed
-TR opt: nested-unboxed-let.rkt 31:16 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 31:11 (+ x 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 31:2 (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i)) -- unboxed let bindings
-TR opt: nested-unboxed-let.rkt 32:7 x -- leave var unboxed
-TR opt: nested-unboxed-let.rkt 32:9 3.0+6.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 32:4 (+ x 3.0+6.0i) -- unboxed binary float complex
-
+TR opt: nested-unboxed-let.rkt 30:14 x -- unbox float-complex
+TR opt: nested-unboxed-let.rkt 30:16 2.0+3.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 30:11 (+ x 2.0+3.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 29:12 1.0+2.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 29:21 2.0+3.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 29:9 (+ 1.0+2.0i 2.0+3.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 29:0 (let ((x (+ 1.0+2.0i 2.0+3.0i))) (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i))) -- unboxed let bindings
+TR opt: nested-unboxed-let.rkt 31:7 x -- unbox float-complex
+TR opt: nested-unboxed-let.rkt 31:9 3.0+6.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 31:4 (+ x 3.0+6.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 30:14 x -- leave var unboxed
+TR opt: nested-unboxed-let.rkt 30:16 2.0+3.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 30:11 (+ x 2.0+3.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 30:2 (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i)) -- unboxed let bindings
+TR opt: nested-unboxed-let.rkt 31:7 x -- leave var unboxed
+TR opt: nested-unboxed-let.rkt 31:9 3.0+6.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 31:4 (+ x 3.0+6.0i) -- unboxed binary float complex
 END
 #<<END
 8.0+14.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt
index de4bac9c..f9990583 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt
@@ -1,21 +1,20 @@
 #;#;
 #<<END
-TR opt: one-arg-arith.rkt 44:0 (- 12) -- unary fixnum
-TR opt: one-arg-arith.rkt 45:0 (- 12.0) -- unary float
-TR opt: one-arg-arith.rkt 46:0 (/ 4.2) -- unary float
-TR opt: one-arg-arith.rkt 48:0 (+ 1) -- unary number
-TR opt: one-arg-arith.rkt 49:0 (+ 1.0) -- unary number
-TR opt: one-arg-arith.rkt 50:0 (+ (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 51:0 (* 1) -- unary number
-TR opt: one-arg-arith.rkt 52:0 (* 1.0) -- unary number
-TR opt: one-arg-arith.rkt 53:0 (* (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 54:0 (min 1) -- unary number
-TR opt: one-arg-arith.rkt 55:0 (min 1.0) -- unary number
-TR opt: one-arg-arith.rkt 56:0 (min (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 57:0 (max 1) -- unary number
-TR opt: one-arg-arith.rkt 58:0 (max 1.0) -- unary number
-TR opt: one-arg-arith.rkt 59:0 (max (expt 2 100)) -- unary number
-
+TR opt: one-arg-arith.rkt 43:0 (- 12) -- unary fixnum
+TR opt: one-arg-arith.rkt 44:0 (- 12.0) -- unary float
+TR opt: one-arg-arith.rkt 45:0 (/ 4.2) -- unary float
+TR opt: one-arg-arith.rkt 47:0 (+ 1) -- unary number
+TR opt: one-arg-arith.rkt 48:0 (+ 1.0) -- unary number
+TR opt: one-arg-arith.rkt 49:0 (+ (expt 2 100)) -- unary number
+TR opt: one-arg-arith.rkt 50:0 (* 1) -- unary number
+TR opt: one-arg-arith.rkt 51:0 (* 1.0) -- unary number
+TR opt: one-arg-arith.rkt 52:0 (* (expt 2 100)) -- unary number
+TR opt: one-arg-arith.rkt 53:0 (min 1) -- unary number
+TR opt: one-arg-arith.rkt 54:0 (min 1.0) -- unary number
+TR opt: one-arg-arith.rkt 55:0 (min (expt 2 100)) -- unary number
+TR opt: one-arg-arith.rkt 56:0 (max 1) -- unary number
+TR opt: one-arg-arith.rkt 57:0 (max 1.0) -- unary number
+TR opt: one-arg-arith.rkt 58:0 (max (expt 2 100)) -- unary number
 END
 #<<END
 -12
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt
index 58846720..a834f28d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: pair-fun.rkt 15:6 (car x) -- pair
-
+TR opt: pair-fun.rkt 14:6 (car x) -- pair
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt
index bc7d9911..08b93706 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt
@@ -1,18 +1,17 @@
 #;#;
 #<<END
-TR opt: pair-known-length-list.rkt 31:0 (car x) -- pair
-TR opt: pair-known-length-list.rkt 32:0 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 33:0 (car (cdr x)) -- pair
+TR opt: pair-known-length-list.rkt 30:0 (car x) -- pair
+TR opt: pair-known-length-list.rkt 31:0 (cdr x) -- pair
+TR opt: pair-known-length-list.rkt 32:0 (car (cdr x)) -- pair
+TR opt: pair-known-length-list.rkt 32:5 (cdr x) -- pair
+TR opt: pair-known-length-list.rkt 33:0 (cdr (cdr x)) -- pair
 TR opt: pair-known-length-list.rkt 33:5 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 34:0 (cdr (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 34:5 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 35:0 (car (cdr (cdr x))) -- pair
+TR opt: pair-known-length-list.rkt 34:0 (car (cdr (cdr x))) -- pair
+TR opt: pair-known-length-list.rkt 34:5 (cdr (cdr x)) -- pair
+TR opt: pair-known-length-list.rkt 34:10 (cdr x) -- pair
+TR opt: pair-known-length-list.rkt 35:0 (cdr (cdr (cdr x))) -- pair
 TR opt: pair-known-length-list.rkt 35:5 (cdr (cdr x)) -- pair
 TR opt: pair-known-length-list.rkt 35:10 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 36:0 (cdr (cdr (cdr x))) -- pair
-TR opt: pair-known-length-list.rkt 36:5 (cdr (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 36:10 (cdr x) -- pair
-
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt
index f1da1754..18a7ef74 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt
@@ -32,7 +32,6 @@ TR opt: pr13468.rkt 146:21 -6.0 -- float-arg-expr in complex ops
 TR opt: pr13468.rkt 146:5 (real-part (ann -6.0 Negative-Flonum)) -- unboxed unary float complex
 TR opt: pr13468.rkt 147:21 6.0 -- float-arg-expr in complex ops
 TR opt: pr13468.rkt 147:5 (real-part (ann 6.0 Flonum)) -- unboxed unary float complex
-
 END
 #<<END
 -6.0-2.3i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt
index e2273e8e..efcc52d2 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: pr13788.rkt 13:0 (vector-length (vector 1 2 3)) -- known-length vector-length
-
+TR opt: pr13788.rkt 12:0 (vector-length (vector 1 2 3)) -- known-length vector-length
 END
 #<<END
 3
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt
index c6d83740..792f7bd6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt
@@ -1,6 +1,5 @@
 #;#;
 #<<END
-
 END
 #<<END
 '(+ 1.0 2.0)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt
index 67b0b589..c4197c36 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: rational-literal.rkt 12:0 (+ 3/4 1.2) -- binary float
-
+TR opt: rational-literal.rkt 11:0 (+ 3/4 1.2) -- binary float
 END
 #<<END
 1.95
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/real-part-loop.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/real-part-loop.rkt
index e79d3664..bba2007d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/real-part-loop.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/real-part-loop.rkt
@@ -16,7 +16,6 @@ TR opt: real-part-loop.rkt 34:6 (loop (+ v 3.6)) -- call to fun with unboxed arg
 TR opt: real-part-loop.rkt 31:15 0.0+1.0i -- unboxed literal
 TR opt: real-part-loop.rkt 31:1 (let loop ((v 0.0+1.0i)) (if (> (real-part v) 70000.2) 0 (loop (+ v 3.6)))) -- unboxed call site
 TR opt: real-part-loop.rkt 31:6 loop -- unboxed let loop
-
 END
 #<<END
 0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt
index 3bbdb76c..d800bbb4 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: silent-dead-branch.rkt 14:0 (when (number? "1") 1) -- dead then branch
-
+TR opt: silent-dead-branch.rkt 13:0 (when (number? "1") 1) -- dead then branch
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt
index 240a7ed7..2780f552 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: simple-float.rkt 14:0 (+ 2.0 3.0) -- binary float
-
+TR opt: simple-float.rkt 13:0 (+ 2.0 3.0) -- binary float
 END
 #<<END
 5.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt
index 44db1243..feaa6275 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: simple-pair.rkt 14:0 (car (cons 1 2)) -- pair
-
+TR opt: simple-pair.rkt 13:0 (car (cons 1 2)) -- pair
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt-segfault.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt-segfault.rkt
index 6fda6a12..a7c96284 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt-segfault.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt-segfault.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: sqrt-segfault.rkt 20:14 (- 0.0 0.0) -- binary float
-TR opt: sqrt-segfault.rkt 21:14 (* dx dx) -- binary float
-TR missed opt: sqrt-segfault.rkt 22:31 (sqrt dist2) -- unexpected complex type
-
+TR opt: sqrt-segfault.rkt 19:14 (- 0.0 0.0) -- binary float
+TR opt: sqrt-segfault.rkt 20:14 (* dx dx) -- binary float
+TR missed opt: sqrt-segfault.rkt 21:31 (sqrt dist2) -- unexpected complex type
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt
index 52f91394..d3554d31 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: sqrt.rkt 13:2 (sqrt x) -- unary float
-
+TR opt: sqrt.rkt 12:2 (sqrt x) -- unary float
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt
index 747f5561..3cbf7a52 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: string-length.rkt 18:0 (string-length "eh") -- string-length
-TR opt: string-length.rkt 19:0 (bytes-length #"eh") -- bytes-length
-
+TR opt: string-length.rkt 17:0 (string-length "eh") -- string-length
+TR opt: string-length.rkt 18:0 (bytes-length #"eh") -- bytes-length
 END
 #<<END
 2
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt
index de2f983e..0aa303bd 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR info: structs.rkt 16:11 pt -- struct constructor
-TR opt: structs.rkt 17:0 (pt-x a) -- struct ref
-TR opt: structs.rkt 18:0 (set-pt-y! a 5) -- struct set
-
+TR info: structs.rkt 15:11 pt -- struct constructor
+TR opt: structs.rkt 16:0 (pt-x a) -- struct ref
+TR opt: structs.rkt 17:0 (set-pt-y! a 5) -- struct set
 END
 #<<END
 3
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt
index 1fa86c7d..b9d166ec 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: ternary-equality.rkt 16:0 (= 1 1 1) -- multi fixnum comp
-
+TR opt: ternary-equality.rkt 15:0 (= 1 1 1) -- multi fixnum comp
 END
 #<<END
 #t
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum-nested.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum-nested.rkt
index 51e414d1..9f0afda5 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum-nested.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum-nested.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: unary-fixnum-nested.rkt 16:26 (length (quote (1 2 3))) -- known-length list length
-TR opt: unary-fixnum-nested.rkt 16:13 (bitwise-not (length (quote (1 2 3)))) -- unary fixnum
-TR opt: unary-fixnum-nested.rkt 16:0 (bitwise-not (bitwise-not (length (quote (1 2 3))))) -- unary fixnum
-
+TR opt: unary-fixnum-nested.rkt 15:26 (length (quote (1 2 3))) -- known-length list length
+TR opt: unary-fixnum-nested.rkt 15:13 (bitwise-not (length (quote (1 2 3)))) -- unary fixnum
+TR opt: unary-fixnum-nested.rkt 15:0 (bitwise-not (bitwise-not (length (quote (1 2 3))))) -- unary fixnum
 END
 #<<END
 3
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt
index feaa23ed..49c5ce30 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: unary-fixnum.rkt 14:0 (bitwise-not 4) -- unary fixnum
-TR opt: unary-fixnum.rkt 15:0 (- (ann 2 Nonnegative-Fixnum)) -- unary fixnum
-
+TR opt: unary-fixnum.rkt 16:0 (bitwise-not 4) -- unary fixnum
+TR opt: unary-fixnum.rkt 17:0 (- (ann 2 Nonnegative-Fixnum)) -- unary fixnum
 END
 #<<END
 -5
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt
index 05bd72fb..bf6f3b76 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: unary-float.rkt 14:0 (sin 2.0) -- unary float
-
+TR opt: unary-float.rkt 13:0 (sin 2.0) -- unary float
 END
 #<<END
 0.9092974268256817
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-exp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-exp.rkt
index 1272ddff..4c52527c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-exp.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-exp.rkt
@@ -1,20 +1,19 @@
 #;#;
 #<<END
+TR opt: unboxed-exp.rkt 32:50 p -- unbox float-complex
+TR opt: unboxed-exp.rkt 32:39 (real-part p) -- complex accessor elimination
 TR opt: unboxed-exp.rkt 33:50 p -- unbox float-complex
-TR opt: unboxed-exp.rkt 33:39 (real-part p) -- complex accessor elimination
-TR opt: unboxed-exp.rkt 34:50 p -- unbox float-complex
-TR opt: unboxed-exp.rkt 34:39 (imag-part p) -- complex accessor elimination
-TR opt: unboxed-exp.rkt 36:30 2.0+3.4i -- unboxed literal
-TR opt: unboxed-exp.rkt 36:25 (exp 2.0+3.4i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 37:30 0.0+0.0i -- unboxed literal
-TR opt: unboxed-exp.rkt 37:25 (exp 0.0+0.0i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 38:30 -12.2-4.7i -- unboxed literal
-TR opt: unboxed-exp.rkt 38:25 (exp -12.2-4.7i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 39:30 12.2-4.7i -- unboxed literal
-TR opt: unboxed-exp.rkt 39:25 (exp 12.2-4.7i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 40:30 -12.2+4.7i -- unboxed literal
-TR opt: unboxed-exp.rkt 40:25 (exp -12.2+4.7i) -- unboxed unary float complex
-
+TR opt: unboxed-exp.rkt 33:39 (imag-part p) -- complex accessor elimination
+TR opt: unboxed-exp.rkt 35:30 2.0+3.4i -- unboxed literal
+TR opt: unboxed-exp.rkt 35:25 (exp 2.0+3.4i) -- unboxed unary float complex
+TR opt: unboxed-exp.rkt 36:30 0.0+0.0i -- unboxed literal
+TR opt: unboxed-exp.rkt 36:25 (exp 0.0+0.0i) -- unboxed unary float complex
+TR opt: unboxed-exp.rkt 37:30 -12.2-4.7i -- unboxed literal
+TR opt: unboxed-exp.rkt 37:25 (exp -12.2-4.7i) -- unboxed unary float complex
+TR opt: unboxed-exp.rkt 38:30 12.2-4.7i -- unboxed literal
+TR opt: unboxed-exp.rkt 38:25 (exp 12.2-4.7i) -- unboxed unary float complex
+TR opt: unboxed-exp.rkt 39:30 -12.2+4.7i -- unboxed literal
+TR opt: unboxed-exp.rkt 39:25 (exp -12.2+4.7i) -- unboxed unary float complex
 END
 #<<END
 "-7.14373-1.88821"
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-for.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-for.rkt
index f98cc2c3..edb762ba 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-for.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-for.rkt
@@ -1,40 +1,39 @@
 #;#;
 #<<END
-TR opt: unboxed-for.rkt 44:0 #%module-begin -- in-list
-TR opt: unboxed-for.rkt 49:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 49:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 49:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 49:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 49:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 49:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 47:31 sum -- unboxed var -> table
-TR opt: unboxed-for.rkt 47:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- fun -> unboxed fun
-TR opt: unboxed-for.rkt 47:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 49:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 49:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 49:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 47:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unbox float-complex
-TR opt: unboxed-for.rkt 47:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
-TR opt: unboxed-for.rkt 48:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 48:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 49:9 i -- leave var unboxed
-TR opt: unboxed-for.rkt 49:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 49:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 47:31 sum -- leave var unboxed
-TR opt: unboxed-for.rkt 47:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
-TR opt: unboxed-for.rkt 49:9 i -- leave var unboxed
-TR opt: unboxed-for.rkt 49:11 sum -- leave var unboxed
-TR opt: unboxed-for.rkt 49:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 48:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 47:31 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 47:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
-TR opt: unboxed-for.rkt 47:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- call to fun with unboxed args
-TR opt: unboxed-for.rkt 47:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 47:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 47:53 0.0+0.0i -- unboxed literal
-TR opt: unboxed-for.rkt 47:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
-TR opt: unboxed-for.rkt 47:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let loop
-
+TR opt: unboxed-for.rkt 43:0 #%module-begin -- in-list
+TR opt: unboxed-for.rkt 48:9 i -- unbox float-complex
+TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 48:9 i -- unbox float-complex
+TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 46:31 sum -- unboxed var -> table
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- fun -> unboxed fun
+TR opt: unboxed-for.rkt 46:31 sum -- unboxed complex variable
+TR opt: unboxed-for.rkt 48:9 i -- unbox float-complex
+TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unbox float-complex
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
+TR opt: unboxed-for.rkt 47:13 i -- unboxed complex variable
+TR opt: unboxed-for.rkt 47:13 i -- unboxed complex variable
+TR opt: unboxed-for.rkt 48:9 i -- leave var unboxed
+TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 46:31 sum -- leave var unboxed
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
+TR opt: unboxed-for.rkt 48:9 i -- leave var unboxed
+TR opt: unboxed-for.rkt 48:11 sum -- leave var unboxed
+TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 47:13 i -- unboxed complex variable
+TR opt: unboxed-for.rkt 46:31 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- call to fun with unboxed args
+TR opt: unboxed-for.rkt 46:31 sum -- unboxed complex variable
+TR opt: unboxed-for.rkt 46:31 sum -- unboxed complex variable
+TR opt: unboxed-for.rkt 46:53 0.0+0.0i -- unboxed literal
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let loop
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions1.rkt
index cb98022e..80288526 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions1.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions1.rkt
@@ -1,19 +1,18 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions1.rkt 27:45 x -- unbox float-complex
-TR opt: unboxed-let-functions1.rkt 27:47 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 27:42 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 27:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions1.rkt 27:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions1.rkt 27:45 x -- leave var unboxed
-TR opt: unboxed-let-functions1.rkt 27:47 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 27:42 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 28:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 28:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 28:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 28:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
-TR opt: unboxed-let-functions1.rkt 28:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
-
+TR opt: unboxed-let-functions1.rkt 26:45 x -- unbox float-complex
+TR opt: unboxed-let-functions1.rkt 26:47 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let-functions1.rkt 26:42 (+ x 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions1.rkt 26:20 x -- unboxed var -> table
+TR opt: unboxed-let-functions1.rkt 26:7 f -- fun -> unboxed fun
+TR opt: unboxed-let-functions1.rkt 26:45 x -- leave var unboxed
+TR opt: unboxed-let-functions1.rkt 26:47 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let-functions1.rkt 26:42 (+ x 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions1.rkt 27:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions1.rkt 27:17 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions1.rkt 27:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions1.rkt 27:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
+TR opt: unboxed-let-functions1.rkt 27:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
 END
 #<<END
 6.0+12.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions2.rkt
index e49cf7a3..7c48c80c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions2.rkt
@@ -1,24 +1,23 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions2.rkt 33:21 x -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 33:23 y -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 33:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 32:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions2.rkt 33:21 x -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 33:23 y -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 33:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 32:42 y -- unboxed var -> table
-TR opt: unboxed-let-functions2.rkt 32:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions2.rkt 33:21 x -- leave var unboxed
-TR opt: unboxed-let-functions2.rkt 33:23 y -- leave var unboxed
-TR opt: unboxed-let-functions2.rkt 33:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 34:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 34:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 34:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 35:5 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 34:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- unboxed call site
-TR opt: unboxed-let-functions2.rkt 34:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- call to fun with unboxed args
-
+TR opt: unboxed-let-functions2.rkt 32:21 x -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 32:23 y -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 32:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 31:20 x -- unboxed var -> table
+TR opt: unboxed-let-functions2.rkt 32:21 x -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 32:23 y -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 32:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 31:42 y -- unboxed var -> table
+TR opt: unboxed-let-functions2.rkt 31:7 f -- fun -> unboxed fun
+TR opt: unboxed-let-functions2.rkt 32:21 x -- leave var unboxed
+TR opt: unboxed-let-functions2.rkt 32:23 y -- leave var unboxed
+TR opt: unboxed-let-functions2.rkt 32:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 33:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions2.rkt 33:17 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions2.rkt 33:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 34:5 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let-functions2.rkt 33:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- unboxed call site
+TR opt: unboxed-let-functions2.rkt 33:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- call to fun with unboxed args
 END
 #<<END
 6.0+12.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions3.rkt
index 562a4248..9d2bf33f 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions3.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions3.rkt
@@ -1,19 +1,18 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions3.rkt 28:21 x -- unbox float-complex
-TR opt: unboxed-let-functions3.rkt 28:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions3.rkt 28:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 27:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions3.rkt 27:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions3.rkt 28:21 x -- leave var unboxed
-TR opt: unboxed-let-functions3.rkt 28:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions3.rkt 28:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 29:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions3.rkt 29:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions3.rkt 29:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 29:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- unboxed call site
-TR opt: unboxed-let-functions3.rkt 29:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- call to fun with unboxed args
-
+TR opt: unboxed-let-functions3.rkt 27:21 x -- unbox float-complex
+TR opt: unboxed-let-functions3.rkt 27:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions3.rkt 27:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions3.rkt 26:20 x -- unboxed var -> table
+TR opt: unboxed-let-functions3.rkt 26:7 f -- fun -> unboxed fun
+TR opt: unboxed-let-functions3.rkt 27:21 x -- leave var unboxed
+TR opt: unboxed-let-functions3.rkt 27:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions3.rkt 27:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions3.rkt 28:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions3.rkt 28:17 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions3.rkt 28:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions3.rkt 28:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- unboxed call site
+TR opt: unboxed-let-functions3.rkt 28:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- call to fun with unboxed args
 END
 #<<END
 6.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions4.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions4.rkt
index e8ca1f97..ed998dfe 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions4.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions4.rkt
@@ -1,19 +1,18 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions4.rkt 28:21 x -- unbox float-complex
-TR opt: unboxed-let-functions4.rkt 28:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions4.rkt 28:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 27:32 x -- unboxed var -> table
-TR opt: unboxed-let-functions4.rkt 27:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions4.rkt 28:21 x -- leave var unboxed
-TR opt: unboxed-let-functions4.rkt 28:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions4.rkt 28:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 30:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions4.rkt 30:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions4.rkt 30:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 29:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
-TR opt: unboxed-let-functions4.rkt 29:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
-
+TR opt: unboxed-let-functions4.rkt 27:21 x -- unbox float-complex
+TR opt: unboxed-let-functions4.rkt 27:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions4.rkt 27:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions4.rkt 26:32 x -- unboxed var -> table
+TR opt: unboxed-let-functions4.rkt 26:7 f -- fun -> unboxed fun
+TR opt: unboxed-let-functions4.rkt 27:21 x -- leave var unboxed
+TR opt: unboxed-let-functions4.rkt 27:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions4.rkt 27:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions4.rkt 29:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions4.rkt 29:17 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions4.rkt 29:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions4.rkt 28:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
+TR opt: unboxed-let-functions4.rkt 28:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
 END
 #<<END
 6.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions5.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions5.rkt
index 62580655..1962adcc 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions5.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions5.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions5.rkt 23:15 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions5.rkt 23:24 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions5.rkt 23:12 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-
+TR opt: unboxed-let-functions5.rkt 22:15 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions5.rkt 22:24 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions5.rkt 22:12 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions6.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions6.rkt
index 190e04cf..43f04d13 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions6.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions6.rkt
@@ -1,24 +1,23 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions6.rkt 34:13 z -- unbox float-complex
-TR opt: unboxed-let-functions6.rkt 34:15 0.0+1.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 34:10 (+ z 0.0+1.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 31:31 z -- unboxed var -> table
-TR opt: unboxed-let-functions6.rkt 31:6 loop -- fun -> unboxed fun
-TR opt: unboxed-let-functions6.rkt 34:13 z -- leave var unboxed
-TR opt: unboxed-let-functions6.rkt 34:15 0.0+1.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 34:10 (+ z 0.0+1.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 35:19 z -- leave var unboxed
-TR opt: unboxed-let-functions6.rkt 35:21 (car l) -- pair
-TR opt: unboxed-let-functions6.rkt 35:21 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions6.rkt 35:16 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 35:10 (loop (+ z (car l)) (cdr l)) -- unboxed call site
-TR opt: unboxed-let-functions6.rkt 36:16 (cdr l) -- pair
-TR opt: unboxed-let-functions6.rkt 35:10 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions6.rkt 31:51 0.0+0.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 31:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) (+ z 0.0+1.0i) (loop (+ z (car l)) (cdr l)))) -- unboxed call site
-TR opt: unboxed-let-functions6.rkt 31:6 loop -- unboxed let loop
-
+TR opt: unboxed-let-functions6.rkt 33:13 z -- unbox float-complex
+TR opt: unboxed-let-functions6.rkt 33:15 0.0+1.0i -- unboxed literal
+TR opt: unboxed-let-functions6.rkt 33:10 (+ z 0.0+1.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions6.rkt 30:31 z -- unboxed var -> table
+TR opt: unboxed-let-functions6.rkt 30:6 loop -- fun -> unboxed fun
+TR opt: unboxed-let-functions6.rkt 33:13 z -- leave var unboxed
+TR opt: unboxed-let-functions6.rkt 33:15 0.0+1.0i -- unboxed literal
+TR opt: unboxed-let-functions6.rkt 33:10 (+ z 0.0+1.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions6.rkt 34:19 z -- leave var unboxed
+TR opt: unboxed-let-functions6.rkt 34:21 (car l) -- pair
+TR opt: unboxed-let-functions6.rkt 34:21 (car l) -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions6.rkt 34:16 (+ z (car l)) -- unboxed binary float complex
+TR opt: unboxed-let-functions6.rkt 34:10 (loop (+ z (car l)) (cdr l)) -- unboxed call site
+TR opt: unboxed-let-functions6.rkt 35:16 (cdr l) -- pair
+TR opt: unboxed-let-functions6.rkt 34:10 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
+TR opt: unboxed-let-functions6.rkt 30:51 0.0+0.0i -- unboxed literal
+TR opt: unboxed-let-functions6.rkt 30:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) (+ z 0.0+1.0i) (loop (+ z (car l)) (cdr l)))) -- unboxed call site
+TR opt: unboxed-let-functions6.rkt 30:6 loop -- unboxed let loop
 END
 #<<END
 6.0+1.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions7.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions7.rkt
index a6ccfc59..413af0fa 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions7.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions7.rkt
@@ -1,23 +1,22 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions7.rkt 35:15 z -- unbox float-complex
-TR opt: unboxed-let-functions7.rkt 35:17 (car l) -- pair
-TR opt: unboxed-let-functions7.rkt 35:17 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions7.rkt 35:12 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions7.rkt 31:31 z -- unboxed var -> table
-TR opt: unboxed-let-functions7.rkt 31:6 loop -- fun -> unboxed fun
-TR opt: unboxed-let-functions7.rkt 34:6 z -- unboxed complex variable
-TR opt: unboxed-let-functions7.rkt 35:15 z -- leave var unboxed
-TR opt: unboxed-let-functions7.rkt 35:17 (car l) -- pair
-TR opt: unboxed-let-functions7.rkt 35:17 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions7.rkt 35:12 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions7.rkt 35:6 (loop (+ z (car l)) (cdr l)) -- unboxed call site
-TR opt: unboxed-let-functions7.rkt 36:12 (cdr l) -- pair
-TR opt: unboxed-let-functions7.rkt 35:6 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions7.rkt 31:51 0.0+0.0i -- unboxed literal
-TR opt: unboxed-let-functions7.rkt 31:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) z (loop (+ z (car l)) (cdr l)))) -- unboxed call site
-TR opt: unboxed-let-functions7.rkt 31:6 loop -- unboxed let loop
-
+TR opt: unboxed-let-functions7.rkt 34:15 z -- unbox float-complex
+TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- pair
+TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions7.rkt 34:12 (+ z (car l)) -- unboxed binary float complex
+TR opt: unboxed-let-functions7.rkt 30:31 z -- unboxed var -> table
+TR opt: unboxed-let-functions7.rkt 30:6 loop -- fun -> unboxed fun
+TR opt: unboxed-let-functions7.rkt 33:6 z -- unboxed complex variable
+TR opt: unboxed-let-functions7.rkt 34:15 z -- leave var unboxed
+TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- pair
+TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions7.rkt 34:12 (+ z (car l)) -- unboxed binary float complex
+TR opt: unboxed-let-functions7.rkt 34:6 (loop (+ z (car l)) (cdr l)) -- unboxed call site
+TR opt: unboxed-let-functions7.rkt 35:12 (cdr l) -- pair
+TR opt: unboxed-let-functions7.rkt 34:6 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
+TR opt: unboxed-let-functions7.rkt 30:51 0.0+0.0i -- unboxed literal
+TR opt: unboxed-let-functions7.rkt 30:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) z (loop (+ z (car l)) (cdr l)))) -- unboxed call site
+TR opt: unboxed-let-functions7.rkt 30:6 loop -- unboxed let loop
 END
 #<<END
 6.0+0.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions8.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions8.rkt
index 146032d1..1d69e1af 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions8.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions8.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions8.rkt 18:67 x -- unbox float-complex
-TR opt: unboxed-let-functions8.rkt 18:69 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions8.rkt 18:64 (+ x 2.0+4.0i) -- unboxed binary float complex
-
+TR opt: unboxed-let-functions8.rkt 17:67 x -- unbox float-complex
+TR opt: unboxed-let-functions8.rkt 17:69 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions8.rkt 17:64 (+ x 2.0+4.0i) -- unboxed binary float complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let.rkt
index 98aeb2d1..00b5225e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let.rkt
@@ -1,28 +1,27 @@
 #;#;
 #<<END
-TR opt: unboxed-let.rkt 38:14 t1 -- unbox float-complex
-TR opt: unboxed-let.rkt 38:17 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let.rkt 38:11 (- t1 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 37:14 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let.rkt 37:23 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let.rkt 37:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 37:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
-TR opt: unboxed-let.rkt 40:5 t2 -- unbox float-complex
-TR opt: unboxed-let.rkt 40:8 t3 -- unbox float-complex
-TR opt: unboxed-let.rkt 40:2 (+ t2 t3) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 38:14 t1 -- leave var unboxed
-TR opt: unboxed-let.rkt 38:17 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let.rkt 38:11 (- t1 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 37:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
-TR opt: unboxed-let.rkt 40:5 t2 -- leave var unboxed
-TR opt: unboxed-let.rkt 40:8 t3 -- unbox float-complex
-TR opt: unboxed-let.rkt 40:2 (+ t2 t3) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 39:11 4.0+8.0i -- unboxed literal
-TR opt: unboxed-let.rkt 37:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
-TR opt: unboxed-let.rkt 40:5 t2 -- leave var unboxed
-TR opt: unboxed-let.rkt 40:8 t3 -- leave var unboxed
-TR opt: unboxed-let.rkt 40:2 (+ t2 t3) -- unboxed binary float complex
-
+TR opt: unboxed-let.rkt 37:14 t1 -- unbox float-complex
+TR opt: unboxed-let.rkt 37:17 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let.rkt 37:11 (- t1 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 36:14 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let.rkt 36:23 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let.rkt 36:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 36:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
+TR opt: unboxed-let.rkt 39:5 t2 -- unbox float-complex
+TR opt: unboxed-let.rkt 39:8 t3 -- unbox float-complex
+TR opt: unboxed-let.rkt 39:2 (+ t2 t3) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 37:14 t1 -- leave var unboxed
+TR opt: unboxed-let.rkt 37:17 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let.rkt 37:11 (- t1 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 36:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
+TR opt: unboxed-let.rkt 39:5 t2 -- leave var unboxed
+TR opt: unboxed-let.rkt 39:8 t3 -- unbox float-complex
+TR opt: unboxed-let.rkt 39:2 (+ t2 t3) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 38:11 4.0+8.0i -- unboxed literal
+TR opt: unboxed-let.rkt 36:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
+TR opt: unboxed-let.rkt 39:5 t2 -- leave var unboxed
+TR opt: unboxed-let.rkt 39:8 t3 -- leave var unboxed
+TR opt: unboxed-let.rkt 39:2 (+ t2 t3) -- unboxed binary float complex
 END
 #<<END
 4.0+8.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let2.rkt
index 77698bf1..d2401f79 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let2.rkt
@@ -1,22 +1,21 @@
 #;#;
 #<<END
-TR opt: unboxed-let2.rkt 31:5 t1 -- unbox float-complex
-TR opt: unboxed-let2.rkt 31:8 t2 -- unbox float-complex
-TR opt: unboxed-let2.rkt 31:2 (+ t1 t2) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 31:5 t1 -- unbox float-complex
-TR opt: unboxed-let2.rkt 31:8 t2 -- unbox float-complex
-TR opt: unboxed-let2.rkt 31:2 (+ t1 t2) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 29:13 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 29:22 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 29:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 30:13 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 30:22 4.0+8.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 30:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 29:0 (let ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (+ 3.0+6.0i 4.0+8.0i))) (+ t1 t2)) -- unboxed let bindings
-TR opt: unboxed-let2.rkt 31:5 t1 -- leave var unboxed
-TR opt: unboxed-let2.rkt 31:8 t2 -- leave var unboxed
-TR opt: unboxed-let2.rkt 31:2 (+ t1 t2) -- unboxed binary float complex
-
+TR opt: unboxed-let2.rkt 30:5 t1 -- unbox float-complex
+TR opt: unboxed-let2.rkt 30:8 t2 -- unbox float-complex
+TR opt: unboxed-let2.rkt 30:2 (+ t1 t2) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 30:5 t1 -- unbox float-complex
+TR opt: unboxed-let2.rkt 30:8 t2 -- unbox float-complex
+TR opt: unboxed-let2.rkt 30:2 (+ t1 t2) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 28:13 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let2.rkt 28:22 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let2.rkt 28:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 29:13 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let2.rkt 29:22 4.0+8.0i -- unboxed literal
+TR opt: unboxed-let2.rkt 29:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 28:0 (let ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (+ 3.0+6.0i 4.0+8.0i))) (+ t1 t2)) -- unboxed let bindings
+TR opt: unboxed-let2.rkt 30:5 t1 -- leave var unboxed
+TR opt: unboxed-let2.rkt 30:8 t2 -- leave var unboxed
+TR opt: unboxed-let2.rkt 30:2 (+ t1 t2) -- unboxed binary float complex
 END
 #<<END
 10.0+20.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let3.rkt
index a7971836..1328632e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let3.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let3.rkt
@@ -1,17 +1,16 @@
 #;#;
 #<<END
-TR opt: unboxed-let3.rkt 34:9 x -- unbox float-complex
-TR opt: unboxed-let3.rkt 34:11 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 34:6 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let3.rkt 31:12 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 31:21 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 31:9 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let3.rkt 31:0 (let ((x (+ 1.0+2.0i 2.0+4.0i))) (if (even? 2) x (+ x 2.0+4.0i))) -- unboxed let bindings
-TR opt: unboxed-let3.rkt 33:6 x -- unboxed complex variable
-TR opt: unboxed-let3.rkt 34:9 x -- leave var unboxed
-TR opt: unboxed-let3.rkt 34:11 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 34:6 (+ x 2.0+4.0i) -- unboxed binary float complex
-
+TR opt: unboxed-let3.rkt 33:9 x -- unbox float-complex
+TR opt: unboxed-let3.rkt 33:11 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let3.rkt 33:6 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let3.rkt 30:12 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let3.rkt 30:21 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let3.rkt 30:9 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let3.rkt 30:0 (let ((x (+ 1.0+2.0i 2.0+4.0i))) (if (even? 2) x (+ x 2.0+4.0i))) -- unboxed let bindings
+TR opt: unboxed-let3.rkt 32:6 x -- unboxed complex variable
+TR opt: unboxed-let3.rkt 33:9 x -- leave var unboxed
+TR opt: unboxed-let3.rkt 33:11 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let3.rkt 33:6 (+ x 2.0+4.0i) -- unboxed binary float complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec-syntaxes+values.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec-syntaxes+values.rkt
index af602ddb..5e7368ab 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec-syntaxes+values.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec-syntaxes+values.rkt
@@ -1,16 +1,15 @@
 #;#;
 #<<END
-TR opt: unboxed-letrec-syntaxes+values.rkt 25:27 x -- unbox float-complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 25:29 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 25:24 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 24:33 1.0+2.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 24:42 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 24:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 23:0 (letrec-syntaxes+values (((s) (syntax-rules () ((_ x) x)))) (((x) (+ 1.0+2.0i 2.0+4.0i))) (+ x 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-letrec-syntaxes+values.rkt 25:27 x -- leave var unboxed
-TR opt: unboxed-letrec-syntaxes+values.rkt 25:29 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 25:24 (+ x 2.0+4.0i) -- unboxed binary float complex
-
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:27 x -- unbox float-complex
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:29 2.0+4.0i -- unboxed literal
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:24 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-letrec-syntaxes+values.rkt 23:33 1.0+2.0i -- unboxed literal
+TR opt: unboxed-letrec-syntaxes+values.rkt 23:42 2.0+4.0i -- unboxed literal
+TR opt: unboxed-letrec-syntaxes+values.rkt 23:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-letrec-syntaxes+values.rkt 22:0 (letrec-syntaxes+values (((s) (syntax-rules () ((_ x) x)))) (((x) (+ 1.0+2.0i 2.0+4.0i))) (+ x 2.0+4.0i)) -- unboxed let bindings
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:27 x -- leave var unboxed
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:29 2.0+4.0i -- unboxed literal
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:24 (+ x 2.0+4.0i) -- unboxed binary float complex
 END
 #<<END
 5.0+10.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec.rkt
index 1ad9209d..efff8221 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec.rkt
@@ -1,20 +1,19 @@
 #;#;
 #<<END
-TR opt: unboxed-letrec.rkt 32:5 x -- unbox float-complex
-TR opt: unboxed-letrec.rkt 32:7 y -- unbox float-complex
-TR opt: unboxed-letrec.rkt 32:2 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 32:5 x -- unbox float-complex
-TR opt: unboxed-letrec.rkt 32:7 y -- unbox float-complex
-TR opt: unboxed-letrec.rkt 32:2 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 30:31 1.0+2.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 31:34 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 31:43 3.0+6.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 31:31 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 29:0 (letrec: ((f : (Any -> Any) (lambda: ((x : Any)) (f x))) (x : Float-Complex 1.0+2.0i) (y : Float-Complex (+ 2.0+4.0i 3.0+6.0i))) (+ x y)) -- unboxed let bindings
-TR opt: unboxed-letrec.rkt 32:5 x -- leave var unboxed
-TR opt: unboxed-letrec.rkt 32:7 y -- leave var unboxed
-TR opt: unboxed-letrec.rkt 32:2 (+ x y) -- unboxed binary float complex
-
+TR opt: unboxed-letrec.rkt 31:5 x -- unbox float-complex
+TR opt: unboxed-letrec.rkt 31:7 y -- unbox float-complex
+TR opt: unboxed-letrec.rkt 31:2 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-letrec.rkt 31:5 x -- unbox float-complex
+TR opt: unboxed-letrec.rkt 31:7 y -- unbox float-complex
+TR opt: unboxed-letrec.rkt 31:2 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-letrec.rkt 29:31 1.0+2.0i -- unboxed literal
+TR opt: unboxed-letrec.rkt 30:34 2.0+4.0i -- unboxed literal
+TR opt: unboxed-letrec.rkt 30:43 3.0+6.0i -- unboxed literal
+TR opt: unboxed-letrec.rkt 30:31 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-letrec.rkt 28:0 (letrec: ((f : (Any -> Any) (lambda: ((x : Any)) (f x))) (x : Float-Complex 1.0+2.0i) (y : Float-Complex (+ 2.0+4.0i 3.0+6.0i))) (+ x y)) -- unboxed let bindings
+TR opt: unboxed-letrec.rkt 31:5 x -- leave var unboxed
+TR opt: unboxed-letrec.rkt 31:7 y -- leave var unboxed
+TR opt: unboxed-letrec.rkt 31:2 (+ x y) -- unboxed binary float complex
 END
 #<<END
 6.0+12.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-make-rectangular.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-make-rectangular.rkt
index 54889701..462eb35c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-make-rectangular.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-make-rectangular.rkt
@@ -1,22 +1,21 @@
 #;#;
 #<<END
-TR opt: unboxed-make-rectangular.rkt 34:5 x -- unbox float-complex
-TR opt: unboxed-make-rectangular.rkt 34:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 34:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 33:9 (make-rectangular 1.0 2.0) -- make-rectangular elimination
-TR opt: unboxed-make-rectangular.rkt 33:0 (let ((x (make-rectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-make-rectangular.rkt 34:5 x -- leave var unboxed
-TR opt: unboxed-make-rectangular.rkt 34:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 34:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 36:5 x -- unbox float-complex
-TR opt: unboxed-make-rectangular.rkt 36:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 36:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 35:9 (unsafe-make-flrectangular 1.0 2.0) -- make-rectangular elimination
-TR opt: unboxed-make-rectangular.rkt 35:0 (let ((x (unsafe-make-flrectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-make-rectangular.rkt 36:5 x -- leave var unboxed
-TR opt: unboxed-make-rectangular.rkt 36:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 36:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-
+TR opt: unboxed-make-rectangular.rkt 33:5 x -- unbox float-complex
+TR opt: unboxed-make-rectangular.rkt 33:7 2.0+4.0i -- unboxed literal
+TR opt: unboxed-make-rectangular.rkt 33:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 32:9 (make-rectangular 1.0 2.0) -- make-rectangular elimination
+TR opt: unboxed-make-rectangular.rkt 32:0 (let ((x (make-rectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
+TR opt: unboxed-make-rectangular.rkt 33:5 x -- leave var unboxed
+TR opt: unboxed-make-rectangular.rkt 33:7 2.0+4.0i -- unboxed literal
+TR opt: unboxed-make-rectangular.rkt 33:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 35:5 x -- unbox float-complex
+TR opt: unboxed-make-rectangular.rkt 35:7 2.0+4.0i -- unboxed literal
+TR opt: unboxed-make-rectangular.rkt 35:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 34:9 (unsafe-make-flrectangular 1.0 2.0) -- make-rectangular elimination
+TR opt: unboxed-make-rectangular.rkt 34:0 (let ((x (unsafe-make-flrectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
+TR opt: unboxed-make-rectangular.rkt 35:5 x -- leave var unboxed
+TR opt: unboxed-make-rectangular.rkt 35:7 2.0+4.0i -- unboxed literal
+TR opt: unboxed-make-rectangular.rkt 35:2 (+ x 2.0+4.0i) -- unboxed binary float complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt
index 4505e468..79c9bd68 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: vector-bounds-check.rkt 29:0 (vector-ref (make-my-vector) 0) -- vector partial bounds checking elimination
-TR opt: vector-bounds-check.rkt 30:0 (flvector-ref (make-my-flvector) 0) -- flvector partial bounds checking elimination
-
+TR opt: vector-bounds-check.rkt 28:0 (vector-ref (make-my-vector) 0) -- vector partial bounds checking elimination
+TR opt: vector-bounds-check.rkt 29:0 (flvector-ref (make-my-flvector) 0) -- flvector partial bounds checking elimination
 END
 #<<END
 1.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt
index 97c339ae..b7979b44 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt
@@ -1,6 +1,5 @@
 #;#;
 #<<END
-
 END
 ""
 #lang racket
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt
index 2431d2a2..23174e38 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: vector-chaperone2.rkt 16:10 (vector-ref v i) -- vector partial bounds checking elimination
-
+TR opt: vector-chaperone2.rkt 15:10 (vector-ref v i) -- vector partial bounds checking elimination
 END
 #<<END
 'b
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt
index 9b4b3357..3ffb875e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: vector-length-nested.rkt 15:0 (vector-length (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0)) -- vector-length
-TR opt: vector-length-nested.rkt 16:1 (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0) -- vector
-
+TR opt: vector-length-nested.rkt 14:0 (vector-length (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0)) -- vector-length
+TR opt: vector-length-nested.rkt 15:1 (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0) -- vector
 END
 #<<END
 2
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt
index da78b219..ae79321f 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt
@@ -1,8 +1,7 @@
 #;#;
 #<<END
-TR opt: vector-length.rkt 16:0 (vector-length (vector 1 2 3)) -- known-length vector-length
-TR opt: vector-length.rkt 17:0 (vector-length (ann (vector 4 5 6) (Vectorof Integer))) -- known-length vector-length
-
+TR opt: vector-length.rkt 15:0 (vector-length (vector 1 2 3)) -- known-length vector-length
+TR opt: vector-length.rkt 16:0 (vector-length (ann (vector 4 5 6) (Vectorof Integer))) -- known-length vector-length
 END
 #<<END
 3
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt
index dd60fff2..2170c6a7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: vector-ref-set-ref.rkt 19:0 (vector-ref x 0) -- vector
-TR opt: vector-ref-set-ref.rkt 20:0 (vector-set! x 1 "2") -- vector
-TR opt: vector-ref-set-ref.rkt 21:0 (vector-ref x 1) -- vector
-
+TR opt: vector-ref-set-ref.rkt 18:0 (vector-ref x 0) -- vector
+TR opt: vector-ref-set-ref.rkt 19:0 (vector-set! x 1 "2") -- vector
+TR opt: vector-ref-set-ref.rkt 20:0 (vector-ref x 1) -- vector
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt
index 577fbed8..72ddbd55 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: vector-ref.rkt 14:0 (vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0) -- vector
-
+TR opt: vector-ref.rkt 13:0 (vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0) -- vector
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt
index 7133d981..1680513e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: vector-ref2.rkt 14:0 (vector-ref (vector 1 2 3) 0) -- vector
-
+TR opt: vector-ref2.rkt 13:0 (vector-ref (vector 1 2 3) 0) -- vector
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt
index 4c46cd3a..30f72d97 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: vector-set-quote.rkt 11:0 (vector-set! (ann (vector (quote (1 2))) (Vector Any)) 0 (quote (+ 1.0 2.0))) -- vector
-
+TR opt: vector-set-quote.rkt 10:0 (vector-set! (ann (vector (quote (1 2))) (Vector Any)) 0 (quote (+ 1.0 2.0))) -- vector
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt
index 8f0d67b6..89dc1d09 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: vector-set.rkt 11:0 (vector-set! (ann (vector 1 2) (Vector Integer Integer)) 0 1) -- vector
-
+TR opt: vector-set.rkt 10:0 (vector-set! (ann (vector 1 2) (Vector Integer Integer)) 0 1) -- vector
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt
index 4f4b464a..0f67a61e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: vector-set2.rkt 11:0 (vector-set! (vector 1 2) 0 2) -- vector
-
+TR opt: vector-set2.rkt 10:0 (vector-set! (vector 1 2) 0 2) -- vector
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt
index 30add14a..99309130 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt
@@ -1,93 +1,92 @@
 #;#;
 #<<END
-TR opt: vector-sum.rkt 78:0 #%module-begin -- dead else branch
-TR opt: vector-sum.rkt 78:0 #%module-begin -- dead else branch
-TR opt: vector-sum.rkt 78:0 #%module-begin -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 89:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 89:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 90:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
-TR opt: vector-sum.rkt 90:15 sum -- dead else branch
-TR opt: vector-sum.rkt 92:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 92:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 90:15 sum -- dead else branch
-TR opt: vector-sum.rkt 90:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 90:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
-TR opt: vector-sum.rkt 90:15 sum -- dead else branch
-TR opt: vector-sum.rkt 92:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 92:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 90:15 sum -- dead else branch
-TR opt: vector-sum.rkt 90:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 89:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 89:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 89:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 89:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 88:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 90:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
-TR opt: vector-sum.rkt 90:15 sum -- dead else branch
-TR opt: vector-sum.rkt 92:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 92:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 90:15 sum -- dead else branch
-TR opt: vector-sum.rkt 90:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 90:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
-TR opt: vector-sum.rkt 90:15 sum -- dead else branch
-TR opt: vector-sum.rkt 92:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 92:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 90:15 sum -- dead else branch
-TR opt: vector-sum.rkt 90:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 87:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-
+TR opt: vector-sum.rkt 93:0 #%module-begin -- dead else branch
+TR opt: vector-sum.rkt 93:0 #%module-begin -- dead else branch
+TR opt: vector-sum.rkt 93:0 #%module-begin -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
+TR opt: vector-sum.rkt 104:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
+TR opt: vector-sum.rkt 104:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 107:4 (+ sum (vector-ref v i)) -- binary float
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
+TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 107:4 (+ sum (vector-ref v i)) -- binary float
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
+TR opt: vector-sum.rkt 104:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
+TR opt: vector-sum.rkt 104:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
+TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
+TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 107:4 (+ sum (vector-ref v i)) -- binary float
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
+TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 107:4 (+ sum (vector-ref v i)) -- binary float
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
+TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt
index c4f5b6a0..66c97a53 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt
@@ -1,7 +1,6 @@
 #;#;
 #<<END
-TR opt: with-type.rkt 17:18 (#%app + x val) -- binary float
-
+TR opt: with-type.rkt 16:18 (#%app + x val) -- binary float
 END
 #<<END
 34.6
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/zero.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/zero.rkt
index 3e5860fc..941377a9 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/zero.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/zero.rkt
@@ -1,9 +1,8 @@
 #;#;
 #<<END
-TR opt: zero.rkt 17:0 (zero? 1) -- fixnum zero?
-TR opt: zero.rkt 18:7 (sqrt 3.0) -- unary float
-TR opt: zero.rkt 18:0 (zero? (sqrt 3.0)) -- float zero?
-
+TR opt: zero.rkt 16:0 (zero? 1) -- fixnum zero?
+TR opt: zero.rkt 17:7 (sqrt 3.0) -- unary float
+TR opt: zero.rkt 17:0 (zero? (sqrt 3.0)) -- float zero?
 END
 #<<END
 #f
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt
index bf77c627..da16654f 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt
@@ -21,7 +21,8 @@
       (lambda ()
         (displayln "#;#;")
         (displayln "#<<END")
-        (displayln new-tr-log)
+        (for ((entry new-tr-log))
+          (displayln entry))
         (displayln "END")
         (if (regexp-match "\n" new-output)
             (begin
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
index cfdf6952..0c66b467 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
@@ -1,7 +1,7 @@
 #lang racket
 
 (require racket/place typed-racket/optimizer/logging
-         unstable/open-place syntax/modcode)
+         unstable/open-place syntax/modcode data/queue)
 (provide start-worker dr serialize-exn deserialize-exn s-exn? generate-log/place verbose?)
 
 (define verbose? (make-parameter #f))
@@ -78,13 +78,13 @@
     (parameterize [(use-compiled-file-paths orig-use-compiled-file-paths)
                    (current-load/use-compiled orig-load/use-compiled)]
       (orig-load/use-compiled path name)))
-  (define tr-log-output (open-output-string))
+  (define tr-logs (make-queue))
 
   (define regular-output
     (with-output-to-string
       (lambda ()
-        (with-tr-logging-to-port
-          tr-log-output
+        (with-tr-logging-to-queue
+          tr-logs
           (thunk
             (parameterize ([current-namespace (make-base-empty-namespace)]
                            [current-load/use-compiled test-load/use-compiled])
@@ -92,4 +92,4 @@
               (namespace-attach-module orig-namespace 'racket)
               (namespace-attach-module orig-namespace 'typed-racket/core)
               (dynamic-require file #f)))))))
-  (list (get-output-string tr-log-output) regular-output))
+  (list (queue->list tr-logs) regular-output))