From a328fe6ac4ba70ddb80d7ba4bdccedd5835f9c4c Mon Sep 17 00:00:00 2001
From: Eric Dobson <eric.n.dobson@gmail.com>
Date: Thu, 20 Jun 2013 22:19:39 -0700
Subject: [PATCH] Separated out the tr log and output.

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

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 f4fbc04e43..8c4c06fca4 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,9 +1,12 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR missed opt: all-real.rkt 27:0 (+ (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 27:8 3, 27:21 4
-TR info: all-real.rkt 27:0 (+ (ann 3 Real) (ann 4 Real)) -- exact real arith
-TR missed opt: all-real.rkt 28:0 (* (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 28:8 3, 28:21 4
-TR info: all-real.rkt 28:0 (* (ann 3 Real) (ann 4 Real)) -- exact real arith
 7
 12
 
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 ad4276a6a8..6a51fb87ad 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,19 +1,22 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: fixnum.rkt 36:10 (* x y) -- fixnum bounded expr
-TR missed opt: fixnum.rkt 39:0 (+ (ann z Fixnum) 234) -- out of fixnum range
-TR missed opt: fixnum.rkt 40:0 (* (ann x Index) (ann y Index)) -- out of fixnum range
-TR opt: fixnum.rkt 43:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 43:15 (+ 301 302) -- fixnum bounded expr
-TR missed opt: fixnum.rkt 43:0 (+ (+ 300 301) (+ 301 302)) -- out of fixnum range
-TR opt: fixnum.rkt 43:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 43:15 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 43:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 43:15 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 44:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 44:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 44:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 44:17 (+ 301 302) -- fixnum bounded expr
 468
 234
 234
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 0389f3b8b1..9df6fd778a 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,9 +1,10 @@
-#;
+#;#;
 #<<END
-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 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
 
 END
+""
 
 #lang typed/racket
 (provide f)
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 9309a60da3..81a64cee05 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,9 +1,12 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-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 14:10 (+ 3 5) -- fixnum bounded expr
-TR opt: multi-file2.rkt 14:3 (* 3.4 (+ 3 5)) -- binary float
 81.6
 
 END
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 7f12230ae6..96a05a0446 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR missed opt: multiple-irritants.rkt 11:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- all args float-arg-expr, result not Float -- caused by: 11:8 4, 11:24 5
-TR info: multiple-irritants.rkt 11:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- exact real arith
 120.0
 
 END
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 4c4829eae2..65c6abf399 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,25 +1,28 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR missed opt: nested-same-kind.rkt 35:7 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 35:19 4
-TR info: nested-same-kind.rkt 35:7 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 35:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 35:7 (* 3.0 (ann 4 Integer))
-TR info: nested-same-kind.rkt 35:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 36:14 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 36:26 4
-TR info: nested-same-kind.rkt 36:14 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 36:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 36:14 (* 3.0 (ann 4 Integer))
-TR info: nested-same-kind.rkt 36:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 36:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- all args float-arg-expr, result not Float -- caused by: 36:7 (* 2.0 (* 3.0 (ann 4 Integer)))
-TR info: nested-same-kind.rkt 36:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 37:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- all args float-arg-expr, result not Float -- caused by: 37:19 4, 37:35 5
-TR info: nested-same-kind.rkt 37:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 37:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- all args float-arg-expr, result not Float -- caused by: 37:7 (* 3.0 (ann 4 Integer) (ann 5 Integer))
-TR info: nested-same-kind.rkt 37:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 38:3 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 38:15 4
-TR info: nested-same-kind.rkt 38:3 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 38:27 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 38:39 4
-TR info: nested-same-kind.rkt 38:27 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 38:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 38:3 (* 3.0 (ann 4 Integer)), 38:27 (* 3.0 (ann 4 Integer))
-TR info: nested-same-kind.rkt 38:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- exact real arith
 24.0
 24.0
 120.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 7ba3a94038..34f6bb7108 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,38 +1,41 @@
-#;
+#;#;
+#<<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 ())
+
+END
 #<<END
-TR missed opt: pair.rkt 59:0 (car (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 59:10 (list 1 2 3)
-TR opt: pair.rkt 60:0 (car (list 1 2 3)) -- pair
-TR missed opt: pair.rkt 61:0 (cdr (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 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 63:0 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 63:5 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 64:0 (cdr (cdr (cdr (list 1 2 3)))) -- pair
-TR opt: pair.rkt 64:5 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 64:10 (cdr (list 1 2 3)) -- pair
-TR missed opt: pair.rkt 65:16 (cdr (cdr (cdr (cdr (list 1 2 3))))) -- car/cdr on a potentially empty list -- caused by: 65:21 (cdr (cdr (cdr (list 1 2 3))))
-TR opt: pair.rkt 65:21 (cdr (cdr (cdr (list 1 2 3)))) -- pair
-TR opt: pair.rkt 65:26 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 65:31 (cdr (list 1 2 3)) -- pair
-TR missed opt: pair.rkt 68:0 (mcar (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 68:6 (values (ann (mlist 1) (MListof Byte)))
-TR opt: pair.rkt 69:0 (mcar (mlist 1 2 3)) -- pair
-TR missed opt: pair.rkt 70:0 (mcdr (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 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 72:0 (mcdr (mcdr (mlist 1 2 3))) -- pair
-TR opt: pair.rkt 72:6 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 73:0 (mcdr (mcdr (mcdr (mlist 1 2 3)))) -- pair
-TR opt: pair.rkt 73:6 (mcdr (mcdr (mlist 1 2 3))) -- pair
-TR opt: pair.rkt 73:12 (mcdr (mlist 1 2 3)) -- pair
-TR missed opt: pair.rkt 74:0 (set-mcar! (values (ann (mlist 2) (MListof Byte))) 2) -- car/cdr on a potentially empty list -- caused by: 74:11 (values (ann (mlist 2) (MListof Byte)))
-TR opt: pair.rkt 75:0 (set-mcar! (mlist 2 3 4) 2) -- pair
-TR missed opt: pair.rkt 76:0 (set-mcdr! (values (ann (mlist 2) (MListof Byte))) (values (ann (mlist 2) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 76:11 (values (ann (mlist 2) (MListof Byte)))
-TR opt: pair.rkt 78:0 (mcar (mcons 2 3)) -- pair
-TR opt: pair.rkt 79:0 (mcdr (mcons 2 3)) -- pair
-TR opt: pair.rkt 80:0 (set-mcar! (mcons 2 3) 3) -- pair
-TR opt: pair.rkt 81:0 (set-mcdr! (mcons 2 3) 4) -- pair
-TR missed opt: pair.rkt 82:17 (mcar (quote ())) -- car/cdr on a potentially empty list -- caused by: 82:23 (quote ())
-TR missed opt: pair.rkt 83:17 (mcdr (quote ())) -- car/cdr on a potentially empty list -- caused by: 83:23 (quote ())
-TR missed opt: pair.rkt 84:17 (set-mcar! (quote ()) 2) -- car/cdr on a potentially empty list -- caused by: 84:28 (quote ())
-TR missed opt: pair.rkt 85:17 (set-mcdr! (ann (quote ()) (MListof Integer)) (ann (mlist 3) (MListof Integer))) -- car/cdr on a potentially empty list -- caused by: 85:33 (quote ())
 1
 1
 '(2 3)
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 5a43962936..dcc35b5a8b 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
@@ -1,24 +1,27 @@
-#;
+#;#;
+#<<END
+TR info: precision-loss.rkt 39:3 (* 3/4 2/3) -- exact real arith
+TR missed opt: precision-loss.rkt 39:0 (+ (* 3/4 2/3) 2.0) -- exact ops inside float expr -- caused by: 39:3 (* 3/4 2/3)
+TR opt: precision-loss.rkt 39:0 (+ (* 3/4 2/3) 2.0) -- binary float
+TR opt: precision-loss.rkt 41:0 (+ 3/4 2.0) -- binary float
+TR info: precision-loss.rkt 43:3 (- 3/4) -- exact real arith
+TR missed opt: precision-loss.rkt 43:0 (+ (- 3/4) 2.0) -- exact ops inside float expr -- caused by: 43:3 (- 3/4)
+TR opt: precision-loss.rkt 43:0 (+ (- 3/4) 2.0) -- binary float
+TR info: precision-loss.rkt 45:39 (+ 1/4 3/4) -- exact real arith
+TR missed opt: precision-loss.rkt 45:0 (+ (vector-ref (quote #(2/3 1/2 3/4)) (assert (+ 1/4 3/4) exact-integer?)) 2.0) -- all args float-arg-expr, result not Float -- caused by: 45:3 (vector-ref (quote #(2/3 1/2 3/4)) (assert (+ 1/4 3/4) exact-integer?))
+TR info: precision-loss.rkt 45:39 (+ 1/4 3/4) -- exact real arith
+TR missed opt: precision-loss.rkt 51:3 (* (r 3/4) 2/3) -- all args float-arg-expr, result not Float -- caused by: 51:6 (r 3/4), 51:14 2/3
+TR info: precision-loss.rkt 51:3 (* (r 3/4) 2/3) -- exact real arith
+TR opt: precision-loss.rkt 52:3 (car (list (* 2.0 (* (r 3/4) 2/3)))) -- pair
+TR missed opt: precision-loss.rkt 52:21 (* (r 3/4) 2/3) -- all args float-arg-expr, result not Float -- caused by: 52:24 (r 3/4), 52:32 2/3
+TR info: precision-loss.rkt 52:21 (* (r 3/4) 2/3) -- exact real arith
+TR missed opt: precision-loss.rkt 52:14 (* 2.0 (* (r 3/4) 2/3)) -- all args float-arg-expr, result not Float -- caused by: 52:21 (* (r 3/4) 2/3)
+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
-TR info: precision-loss.rkt 37:3 (* 3/4 2/3) -- exact real arith
-TR missed opt: precision-loss.rkt 37:0 (+ (* 3/4 2/3) 2.0) -- exact ops inside float expr -- caused by: 37:3 (* 3/4 2/3)
-TR opt: precision-loss.rkt 37:0 (+ (* 3/4 2/3) 2.0) -- binary float
-TR opt: precision-loss.rkt 39:0 (+ 3/4 2.0) -- binary float
-TR info: precision-loss.rkt 41:3 (- 3/4) -- exact real arith
-TR missed opt: precision-loss.rkt 41:0 (+ (- 3/4) 2.0) -- exact ops inside float expr -- caused by: 41:3 (- 3/4)
-TR opt: precision-loss.rkt 41:0 (+ (- 3/4) 2.0) -- binary float
-TR info: precision-loss.rkt 43:39 (+ 1/4 3/4) -- exact real arith
-TR missed opt: precision-loss.rkt 43:0 (+ (vector-ref (quote #(2/3 1/2 3/4)) (assert (+ 1/4 3/4) exact-integer?)) 2.0) -- all args float-arg-expr, result not Float -- caused by: 43:3 (vector-ref (quote #(2/3 1/2 3/4)) (assert (+ 1/4 3/4) exact-integer?))
-TR info: precision-loss.rkt 43:39 (+ 1/4 3/4) -- exact real arith
-TR missed opt: precision-loss.rkt 49:3 (* (r 3/4) 2/3) -- all args float-arg-expr, result not Float -- caused by: 49:6 (r 3/4), 49:14 2/3
-TR info: precision-loss.rkt 49:3 (* (r 3/4) 2/3) -- exact real arith
-TR opt: precision-loss.rkt 50:3 (car (list (* 2.0 (* (r 3/4) 2/3)))) -- pair
-TR missed opt: precision-loss.rkt 50:21 (* (r 3/4) 2/3) -- all args float-arg-expr, result not Float -- caused by: 50:24 (r 3/4), 50:32 2/3
-TR info: precision-loss.rkt 50:21 (* (r 3/4) 2/3) -- exact real arith
-TR missed opt: precision-loss.rkt 50:14 (* 2.0 (* (r 3/4) 2/3)) -- all args float-arg-expr, result not Float -- caused by: 50:21 (* (r 3/4) 2/3)
-TR info: precision-loss.rkt 50:14 (* 2.0 (* (r 3/4) 2/3)) -- exact real arith
-TR missed opt: precision-loss.rkt 49: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: 49:3 (* (r 3/4) 2/3), 50:3 (car (list (* 2.0 (* (r 3/4) 2/3))))
-TR info: precision-loss.rkt 49:0 (* (* (r 3/4) 2/3) (car (list (* 2.0 (* (r 3/4) 2/3)))) 2.0) -- exact real arith
 2.5
 2.75
 1.25
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 600e256035..6420ba6373 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,12 +1,15 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR missed opt: real-in-float-expr.rkt 21:0 (* (ann 3 Real) 2.3) -- all args float-arg-expr, result not Float -- caused by: 21:8 3
-TR info: real-in-float-expr.rkt 21:0 (* (ann 3 Real) 2.3) -- exact real arith
-TR opt: real-in-float-expr.rkt 26:0 (* 2 3) -- fixnum bounded expr
-TR opt: real-in-float-expr.rkt 27:0 (+ 2 3) -- fixnum bounded expr
-TR info: real-in-float-expr.rkt 28:0 (+ 2/3 3/4) -- exact real arith
-TR missed opt: real-in-float-expr.rkt 30:0 (* (ann 2 Natural) 2.0) -- all args float-arg-expr, result not Float -- caused by: 30:8 2
-TR info: real-in-float-expr.rkt 30:0 (* (ann 2 Natural) 2.0) -- exact real arith
 6.8999999999999995
 6
 5
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 c7323aec42..33379db3b9 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,11 +1,14 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR missed opt: unary-float.rkt 18:0 (sin (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 18:10 3.4
-TR info: unary-float.rkt 18:0 (sin (ann 3.4 Real)) -- exact real arith
-TR missed opt: unary-float.rkt 19:0 (sin 3) -- all args float-arg-expr, result not Float -- caused by: 19:5 3
-TR info: unary-float.rkt 19:0 (sin 3) -- exact real arith
-TR missed opt: unary-float.rkt 20:0 (abs (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 (abs (ann 3.4 Real)) -- exact real arith
 -0.2555411020268312
 0.1411200080598672
 3.4
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 8e41c8763b..41c20c8a35 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,9 +1,12 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR missed opt: unexpected-complex.rkt 16:0 (sqrt (ann 4 Integer)) -- unexpected complex type
-TR opt: unexpected-complex.rkt 17:3 1.2+3.4i -- unboxed literal
-TR opt: unexpected-complex.rkt 17:12 2.0 -- float-arg-expr in complex ops
-TR opt: unexpected-complex.rkt 17:0 (+ 1.2+3.4i 2.0) -- unboxed binary float complex
 2
 3.2+3.4i
 
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 42113ab1b1..3cb9f35e26 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
@@ -14,21 +14,15 @@
   (test-suite
     (format "Log Comparison for ~a" name)
     (test-begin
-      ;; ugly, but otherwise rackunit spews the entire logs to
-      ;; stderr, and they can be quite long
-      (define-values (tr-log output) (generate-log name dir))
-      (check-equal?
-       ;; actual log
-       (with-input-from-string
-           (string-append "(" tr-log output ")")
-         read)
-       ;; expected log
-       (with-input-from-file (build-path dir name)
-         (lambda () ; from the test file
-           (read-line) ; skip the #;
-           (with-input-from-string (read) 
-              (lambda ()
-                (for/list ((v (in-port))) v)))))))))
+      (define-values (log output) (generate-log name dir))
+      (define-values (expected-log expected-output)
+        (with-input-from-file (build-path dir name)
+          (lambda () ; from the test file
+            (read-line) ; skip the #;#;
+            (values (read) (read)))))
+
+      (check-equal? log expected-log)
+      (check-equal? output expected-output))))
 
 
 (define-runtime-path tests-dir                "./tests")
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 56d328a645..49e189435c 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,9 +1,12 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: add1.rkt 15:5 (add1 5) -- fixnum add1
-TR opt: add1.rkt 16:5 (sub1 3) -- fixnum sub1
-TR opt: add1.rkt 17:5 (add1 2.3) -- float add1
-TR opt: add1.rkt 18:5 (sub1 2.25) -- float sub1
 6
 2
 3.3
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 a858da8960..b772af11c8 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,11 +1,12 @@
-#;
+#;#;
 #<<END
-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
+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
 
 END
+""
 #lang typed/racket #:optimize
 
 (define a (+ 1.0 2.0))
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 71454679f6..be75e07da9 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: apply-plus.rkt 13:0 (apply + (map add1 (list 1 2 3))) -- apply-map
-TR opt: apply-plus.rkt 14:0 (apply * (map add1 (list 1 2 3))) -- apply-map
 9
 24
 
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 7b0c399df2..35a10aba3b 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: begin-float.rkt 13:7 (- 2.0 3.0) -- binary float
-TR opt: begin-float.rkt 14:7 (* 2.0 3.0) -- binary float
 -1.0
 6.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 cf44af3626..7055e3b3ea 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,9 +1,10 @@
-#;
+#;#;
 #<<END
-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
+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
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 446cc1a18a..9e8d2f559c 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: binary-nonzero-fixnum.rkt 12:8 (vector-length (quote #(1 2 3))) -- known-length vector-length
-TR opt: binary-nonzero-fixnum.rkt 12:0 (modulo (vector-length (quote #(1 2 3))) 2) -- binary nonzero fixnum
 1
 
 END
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 c3f27e8a2d..6c98051929 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,19 +1,22 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: bounds-check.rkt 32:2 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 35:2 (vector-set! v i n) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 38:2 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 41:2 (vector-set! v i n) -- vector partial bounds checking elimination
-TR info: bounds-check.rkt 44:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 46:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 48:1 displayln -- hidden parameter
-TR opt: bounds-check.rkt 53:2 (flvector-ref v i) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 56:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 59:2 (flvector-ref v i) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 62:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
-TR info: bounds-check.rkt 65:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 67:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 69:1 displayln -- hidden parameter
 3
 4
 5
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 d734ffc31a..f25cc0c724 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,8 +1,11 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: box.rkt 18:0 (unbox x) -- box
-TR opt: box.rkt 19:0 (set-box! x 2) -- box
-TR opt: box.rkt 20:0 (unbox x) -- box
 1
 2
 
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 febddad56e..f978862782 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,15 +1,16 @@
-#;
+#;#;
 #<<END
-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
+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
 
 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 b531bb3410..bc8b1fb0fe 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,9 +1,10 @@
-#;
+#;#;
 #<<END
-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
+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
 
 END
+""
 #lang typed/racket
 
 (: f (case-> (Symbol Symbol -> String)))
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 1d8cdbe658..bcff876de8 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,9 +1,12 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: complex-exp.rkt 13:8 0 -- float-arg-expr in complex ops
-TR opt: complex-exp.rkt 13:3 (exp 0) -- unboxed unary float complex
-TR opt: complex-exp.rkt 13:11 1.0+2.0i -- unboxed literal
-TR opt: complex-exp.rkt 13:0 (- (exp 0) 1.0+2.0i) -- unboxed binary float complex
 0.0-2.0i
 
 END
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 599ffd04aa..06a907ca67 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,7 +1,8 @@
-#;
+#;#;
 #<<END
 
 END
+""
 
 #lang typed/scheme #:optimize
 
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 9b4514d759..e81168cf63 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: cross-module-struct2.rkt 15:0 (x-x a) -- struct ref
+
+END
 #<<END
-TR opt: cross-module-struct2.rkt 12:0 (x-x a) -- struct ref
 1
 
 END
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 fa0c601a00..705a002d08 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,13 +1,14 @@
-#;
+#;#;
 #<<END
-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
-5.05.0
+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
+
 END
+"5.05.0"
 #lang typed/scheme
 #:optimize
 (display (if (number? 3)
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 443ba07d30..ae3e3d986a 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,65 +1,68 @@
-#;
+#;#;
 #<<END
-TR opt: dead-inf-comp.rkt 106:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 108:4 (quote dead) -- dead then branch
+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 115:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 119:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 121: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 128:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 132:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 134: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 141:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 145:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 147: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 154:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 159:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 157:4 (< rat +inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 161:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 160:4 (< +inf.f rat) -- exact real arith
+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 (< rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 168:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 166:4 (< -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 172:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 170:4 (> +inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 174:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 173:4 (> rat +inf.f) -- exact real arith
+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 (> -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 181:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 179:4 (> rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 185:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 183:4 (<= rat +inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 187:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 186:4 (<= +inf.f rat) -- exact real arith
+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 (<= rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 194:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 192:4 (<= -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 198:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 196:4 (>= +inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 200:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 199:4 (>= rat +inf.f) -- exact real arith
+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 (>= -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 207:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 205:4 (>= rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 100:0 #%module-begin -- in-range
-TR opt: dead-inf-comp.rkt 100:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 100:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 100:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR info: dead-inf-comp.rkt 210:41 displayln -- hidden parameter
-TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR info: dead-inf-comp.rkt 210:41 displayln -- hidden parameter
-TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else 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
+
+END
+#<<END
 'live
 'live
 '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 096f4cae7f..ba0d509c94 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,7 +1,10 @@
-#;
+#;#;
+#<<END
+TR info: dead-substructs.rkt 29:4 make-child1 -- struct constructor
+TR info: dead-substructs.rkt 30:4 make-child2 -- struct constructor
+
+END
 #<<END
-TR info: dead-substructs.rkt 26:4 make-child1 -- struct constructor
-TR info: dead-substructs.rkt 27:4 make-child2 -- struct constructor
 1
 2
 
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 a1fae21921..b0379788e1 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,13 +1,14 @@
-#;
+#;#;
 #<<END
-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
-9.09.0
+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
+
 END
+"9.09.0"
 #lang typed/scheme
 #:optimize
 (display (if (number? "eh")
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 718ff04ae1..64bad43cca 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,10 +1,11 @@
-#;
+#;#;
 #<<END
-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
--1.0
+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
+
 END
+"-1.0"
 
 #lang typed/scheme
 #:optimize
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 eea23593c0..e8d49d1d60 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: define-call-float.rkt 10:16 (+ 1.0 2.0) -- binary float
+TR opt: define-call-float.rkt 11:16 (+ 1.0 2.0) -- binary float
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 48726ebab9..591e730c7f 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: define-float.rkt 10:10 (+ 1.0 2.0) -- binary float
+TR opt: define-float.rkt 11:10 (+ 1.0 2.0) -- binary float
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 c4dd140ead..28d1edad33 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: define-pair.rkt 10:10 (car (quote (1 3))) -- pair
+TR opt: define-pair.rkt 11:10 (car (quote (1 3))) -- pair
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 2084d2f2ad..de520b19d8 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,13 +1,16 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: derived-pair.rkt 20:0 (caar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 20:0 (caar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 21:0 (cadr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 21:0 (cadr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 22:0 (cdar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 22:0 (cdar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 23:0 (cddr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 23:0 (cddr (cons 1 (cons 2 3))) -- pair
 1
 2
 2
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 2f84e6ac67..4165e9a314 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,29 +1,32 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: derived-pair2.rkt 40:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 40:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 40:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 41:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 41:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 41:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 42:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 42:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 42:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 43:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 43:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 43:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 44:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 44:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 44:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 45:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 45:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 45:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 46:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 46:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 46:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 47:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 47:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 47:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
 1
 2
 2
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 a31692af6c..eb74adec62 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,69 +1,72 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: derived-pair3.rkt 88:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 88:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 88:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 88:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 89:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 89:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 89:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 89:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 90:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 90:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 90:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 90:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 91:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 91:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 91:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 91:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 92:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 92:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 92:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 92:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 93:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 93:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 93:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 93:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 94:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 94:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 94:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 94:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 95:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 95:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 95:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 95:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 96:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 96:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 96:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 96:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 97:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 97:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 97:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 97:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 98:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 98:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 98:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 98:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 99:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 99:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 99:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 99:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 100:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 100:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 100:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 100:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 101:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 101:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 101:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 101:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 102:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 102:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 102:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 102:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
 1
 2
 2
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 37be435b54..4f18fabaa3 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR info: different-langs.rkt 15:0 (/ 1 2) -- exact real arith
+
+END
 #<<END
-TR info: different-langs.rkt 12:0 (/ 1 2) -- exact real arith
 1/2
 
 END
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 57657baa1d..46aa17e852 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: double-float.rkt 14:0 (+ 2.0 2.0 2.0) -- binary float
+
+END
 #<<END
-TR opt: double-float.rkt 11:0 (+ 2.0 2.0 2.0) -- binary float
 6.0
 
 END
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 1625c4af9d..1f1a61593d 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
@@ -1,7 +1,10 @@
-#;
+#;#;
+#<<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
-TR opt: drop-pure-pred.rkt 16:6 (list 2) -- dead else branch
-TR opt: drop-pure-pred.rkt 14:6 (exact-integer? x) -- useless pure code
 '(1)
 
 END
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 620e8e6beb..c6f2f65b6a 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,13 +1,16 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: exact-inexact.rkt 23:0 (exact->inexact (expt 10 100)) -- int to float
-TR opt: exact-inexact.rkt 24:7 (exact->inexact (expt 2.3 3.2)) -- float to float
-TR opt: exact-inexact.rkt 24:0 (round (exact->inexact (expt 2.3 3.2))) -- unary float
-TR opt: exact-inexact.rkt 25:0 (real->double-flonum (expt 10 100)) -- int to float
-TR opt: exact-inexact.rkt 26:7 (real->double-flonum (expt 2.3 3.2)) -- float to float
-TR opt: exact-inexact.rkt 26:0 (round (real->double-flonum (expt 2.3 3.2))) -- unary float
-TR opt: exact-inexact.rkt 29:0 (exact->inexact (expt 1.0f0 2.0f0)) -- single-float to single-float
-TR opt: exact-inexact.rkt 30:0 (real->single-flonum (expt 1.0f0 2.0f0)) -- single-float to single-float
 1e+100
 14.0
 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 2f818ee699..5d39bb5a1b 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,9 +1,10 @@
-#;
+#;#;
 #<<END
-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
+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
 
 END
+""
 
 #lang typed/racket
 
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 3f459ab7f4..3f37b64b2e 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: false-huh-dead-code.rkt 11:16 1 -- dead then branch
-TR opt: false-huh-dead-code.rkt 12:13 1 -- dead then branch
 2
 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 cd89726365..11a2bcc1bc 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,4 +1,4 @@
-#;
+#;#;
 #<<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
@@ -27,6 +27,9 @@ 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
+
+END
+#<<END
 28
 89525
 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 23ad3687b9..62a4e8dab0 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,8 +1,11 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: fixnum-comparison.rkt 13:3 (vector-length (quote #(1 2 3))) -- known-length vector-length
-TR opt: fixnum-comparison.rkt 13:29 (string-length "asdf") -- string-length
-TR opt: fixnum-comparison.rkt 13:0 (< (vector-length (quote #(1 2 3))) (string-length "asdf")) -- binary fixnum comp
 #t
 
 END
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 5818e4dae1..10d63141d1 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: float-comp.rkt 14:0 (< 1.0 2.0) -- binary float comp
+
+END
 #<<END
-TR opt: float-comp.rkt 11:0 (< 1.0 2.0) -- binary float comp
 #t
 
 END
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 305e859d0b..c5f64fc9a7 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,9 +1,12 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: float-complex-conjugate-top.rkt 14:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-conjugate-top.rkt 14:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-conjugate-top.rkt 14:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-conjugate-top.rkt 14:0 (conjugate (+ 1.0+2.0i 2.0+4.0i)) -- unboxed unary float complex
 3.0-6.0i
 
 END
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 f8decdac55..1c8e3b23fb 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,10 +1,13 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: float-complex-conjugate.rkt 15:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-conjugate.rkt 15:3 (conjugate 1.0+2.0i) -- unboxed unary float complex
-TR opt: float-complex-conjugate.rkt 15:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-conjugate.rkt 15:24 (conjugate 2.0+4.0i) -- unboxed unary float complex
-TR opt: float-complex-conjugate.rkt 15:0 (+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i)) -- unboxed binary float complex
 3.0-6.0i
 
 END
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 7659b56a9a..9364b920df 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,9 +1,12 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: float-complex-div.rkt 14:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-div.rkt 14:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-div.rkt 14:21 3.0+6.0i -- unboxed literal
-TR opt: float-complex-div.rkt 14:0 (/ 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 0.03333333333333333-0.06666666666666667i
 
 END
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 f9aff1c64c..93b780933e 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,12 +1,15 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: float-complex-fixnum.rkt 17:3 (modulo 2 1) -- binary nonzero fixnum
-TR opt: float-complex-fixnum.rkt 17:3 (modulo 2 1) -- binary nonzero fixnum
-TR opt: float-complex-fixnum.rkt 17:3 (modulo 2 1) -- binary nonzero fixnum
-TR opt: float-complex-fixnum.rkt 17:3 (modulo 2 1) -- float-arg-expr in complex ops
-TR opt: float-complex-fixnum.rkt 17:16 1.0+2.0i -- unboxed literal
-TR opt: float-complex-fixnum.rkt 17:25 3.0+6.0i -- unboxed literal
-TR opt: float-complex-fixnum.rkt 17:0 (+ (modulo 2 1) 1.0+2.0i 3.0+6.0i) -- unboxed binary float complex
 4.0+8.0i
 
 END
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 5cc4d8fbd4..c8047060b0 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,35 +1,38 @@
-#;
+#;#;
 #<<END
-TR opt: float-complex-float-div.rkt 41:62 x -- unbox float-complex
-TR opt: float-complex-float-div.rkt 41:51 (real-part x) -- complex accessor elimination
-TR opt: float-complex-float-div.rkt 42:62 x -- unbox float-complex
-TR opt: float-complex-float-div.rkt 42:51 (imag-part x) -- complex accessor elimination
-TR opt: float-complex-float-div.rkt 44:9 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 44:13 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 44:6 (/ 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 45:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 45:18 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 45:6 (/ 1.0+2.0i 2.0) -- unboxed binary float complex
-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:22 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 46:6 (/ 1.0 2.0+4.0i 3.0+6.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:22 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 47:6 (/ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
+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+4.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 48:27 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 48:6 (/ 1.0+2.0i 2.0+4.0i 3.0) -- 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 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 49:6 (/ 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 50:9 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 50:13 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 50:17 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 50:6 (/ 1.0 2.0 3.0+6.0i) -- unboxed binary float complex
+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 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 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 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
+
+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")
 
 END
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 a31e04cf4a..2378b557fe 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,27 +1,30 @@
-#;
+#;#;
 #<<END
-TR opt: float-complex-float-mul.rkt 37:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 37:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 37:0 (* 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 38:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 38:12 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 38:0 (* 1.0+2.0i 2.0) -- unboxed binary float complex
-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:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 39:0 (* 1.0 2.0+4.0i 3.0+6.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:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 40:0 (* 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
+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+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 41:21 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 41:0 (* 1.0+2.0i 2.0+4.0i 3.0) -- 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 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 42:0 (* 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
+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 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 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 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
+
+END
+#<<END
 2.0+4.0i
 2.0+4.0i
 -18.0+24.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 5f18f9e249..96c24d86ff 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,23 +1,26 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: float-complex-float-small.rkt 32:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 32:12 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 32:0 (+ 1.0+2.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 33:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 33:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 33:0 (+ 1.0 2.0+4.0i) -- 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:15 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 36:19 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 36:12 (+ 1.0 2.0) -- binary float
-TR opt: float-complex-float-small.rkt 36:12 (+ 1.0 2.0) -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 36:0 (+ 1.0+2.0i (+ 1.0 2.0)) -- unboxed binary float complex
 4.0+2.0i
 3.0+4.0i
 -2.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 8954bcebe2..fb30b72dd0 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,21 +1,24 @@
-#;
+#;#;
 #<<END
-TR opt: float-complex-float.rkt 29:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float.rkt 29:12 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float.rkt 29:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 29:0 (+ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 30:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float.rkt 30:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float.rkt 30:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 30:0 (- 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-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+2.0i -- unboxed literal
-TR opt: float-complex-float.rkt 32:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float.rkt 32:21 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float.rkt 32:0 (- 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
+TR opt: float-complex-float.rkt 32:12 2.0 -- float-arg-expr in complex ops
+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 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 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
+
+END
+#<<END
 6.0+8.0i
 -4.0-10.0i
 -4.0-4.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 0c53b4d918..4df8dac7ac 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,10 +1,13 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: float-complex-i.rkt 15:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-i.rkt 15:15 0+1.0i -- unboxed literal
-TR opt: float-complex-i.rkt 15:21 2.0+4.0i -- unboxed literal
-TR opt: float-complex-i.rkt 15:12 (* 0+1.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-i.rkt 15:0 (+ 1.0+2.0i (* 0+1.0i 2.0+4.0i)) -- unboxed binary float complex
 -3.0+4.0i
 
 END
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 ede3ff8ddd..92850d8705 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,8 +1,11 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: float-complex-integer.rkt 13:3 (expt 2 100) -- float-arg-expr in complex ops
-TR opt: float-complex-integer.rkt 13:16 1.0+2.0i -- unboxed literal
-TR opt: float-complex-integer.rkt 13:0 (+ (expt 2 100) 1.0+2.0i) -- unboxed binary float complex
 1.2676506002282294e+30+2.0i
 
 END
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 e8e414e19e..4608502451 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,9 +1,12 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: float-complex-mult.rkt 14:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 14:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 14:21 3.0+6.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 14:0 (* 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 -66.0-12.0i
 
 END
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 c4f5eea7fe..1669f73641 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,11 +1,14 @@
-#;
+#;#;
+#<<END
+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 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
+
+END
 #<<END
-TR opt: float-complex-parts.rkt 18:11 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts.rkt 18:0 (real-part 1.0+2.0i) -- complex accessor elimination
-TR opt: float-complex-parts.rkt 19:11 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts.rkt 19:0 (imag-part 1.0+2.0i) -- complex accessor elimination
-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
 1.0
 2.0
 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 a9e7dd699a..eee4ccea70 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,33 +1,36 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: float-complex-parts2.rkt 43:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 43:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 43:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 43:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 43:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 43:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 43:0 (real-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 44:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 44:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 44:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 44:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 44:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 44:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 44:0 (unsafe-flreal-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 (imag-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-flimag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
 3.0
 3.0
 6.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 ba24c89a90..b3f82aeb8a 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,29 +1,32 @@
-#;
+#;#;
+#<<END
+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
+
+END
 #<<END
-TR opt: float-complex-parts3.rkt 39:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 39:26 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 39:35 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 39:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 39:12 (real-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 39: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 40:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 40:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 40:44 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 40:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 40:12 (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 40: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 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 (imag-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 (imag-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-flimag-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-flimag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
 6.0+2.0i
 6.0+2.0i
 11.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 1f3de55c4a..c5f2303293 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,16 +1,19 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR missed opt: float-complex-sin.rkt 23:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 23:21 t
-TR info: float-complex-sin.rkt 23:18 (* t 6.28) -- exact real arith
-TR missed opt: float-complex-sin.rkt 23:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 23:18 (* t 6.28)
-TR info: float-complex-sin.rkt 23:13 (sin (* t 6.28)) -- exact real arith
-TR missed opt: float-complex-sin.rkt 23:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 23:21 t
-TR info: float-complex-sin.rkt 23:18 (* t 6.28) -- exact real arith
-TR missed opt: float-complex-sin.rkt 23:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 23:18 (* t 6.28)
-TR info: float-complex-sin.rkt 23:13 (sin (* t 6.28)) -- exact real arith
-TR opt: float-complex-sin.rkt 23:13 (sin (* t 6.28)) -- float-arg-expr in complex ops
-TR opt: float-complex-sin.rkt 23:30 0.0+0.0i -- unboxed literal
-TR opt: float-complex-sin.rkt 23:10 (+ (sin (* t 6.28)) 0.0+0.0i) -- unboxed binary float complex
 -0.0031853017931379904+0.0i
 
 END
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 8ba192f46f..eb4da9f2d7 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,11 +1,14 @@
-#;
+#;#;
+#<<END
+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
+
+END
 #<<END
-TR opt: float-complex.rkt 17:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex.rkt 17:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex.rkt 17:0 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex.rkt 18:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex.rkt 18:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex.rkt 18:0 (- 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 3.0+6.0i
 -1.0-2.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 67f65dc713..4b4cc04d9b 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: float-fun.rkt 13:2 (+ x 1.0) -- binary float
+TR opt: float-fun.rkt 14:2 (+ x 1.0) -- binary float
 
 END
+""
 
 #lang typed/racket
 #:optimize
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 91c3238b67..c60fe00197 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
@@ -1,9 +1,12 @@
-#;
+#;#;
+#<<END
+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
-TR opt: float-promotion.rkt 15:11 (modulo 1 2) -- binary nonzero fixnum
-TR opt: float-promotion.rkt 15:11 (modulo 1 2) -- binary nonzero fixnum
-TR opt: float-promotion.rkt 15:0 (+ (assert (modulo 1 2) exact-positive-integer?) 2.0) -- binary float
-TR opt: float-promotion.rkt 16:0 (+ (expt 100 100) 2.0) -- binary float
 3.0
 1e+200
 
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 4118b1c548..1edd0d4237 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,13 +1,16 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: float-real.rkt 19:0 (+ 2.3 (ann 3 Positive-Real)) -- binary float
-TR missed opt: float-real.rkt 20:15 (* (ann 2 Integer) 3.2) -- all args float-arg-expr, result not Float -- caused by: 20:23 2
-TR info: float-real.rkt 20:15 (* (ann 2 Integer) 3.2) -- exact real arith
-TR opt: float-real.rkt 20:0 (+ 2.3 (assert (* (ann 2 Integer) 3.2) positive?)) -- binary float
-TR missed opt: float-real.rkt 21:7 (* (ann 2 Integer) 3.1) -- all args float-arg-expr, result not Float -- caused by: 21:15 2
-TR info: float-real.rkt 21:7 (* (ann 2 Integer) 3.1) -- exact real arith
-TR missed opt: float-real.rkt 21:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- all args float-arg-expr, result not Float -- caused by: 21:7 (* (ann 2 Integer) 3.1)
-TR info: float-real.rkt 21:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- exact real arith
 5.3
 8.7
 14.26
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 d2d7ee3e28..293260a584 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: flvector-length.rkt 14:0 (flvector-length (flvector 0.0 1.2)) -- flvector-length
+
+END
 #<<END
-TR opt: flvector-length.rkt 11:0 (flvector-length (flvector 0.0 1.2)) -- flvector-length
 2
 
 END
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 3679f3f1c9..3a7ed3b145 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: fx-fl.rkt 14:0 (exact->inexact 1) -- fixnum to float
+
+END
 #<<END
-TR opt: fx-fl.rkt 11:0 (exact->inexact 1) -- fixnum to float
 1.0
 
 END
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 d719a6e98d..3a623b716d 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,10 +1,11 @@
-#;
+#;#;
 #<<END
-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
-495051
+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
+
 END
+"495051"
 #lang typed/scheme
 #:optimize
 (for: ((i : Integer #"123"))
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 da4f63013c..6a6994dd30 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,10 +1,11 @@
-#;
+#;#;
 #<<END
-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
-123
+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
+
 END
+"123"
 #lang typed/scheme
 #:optimize
 (for: ((i : Natural '(1 2 3)))
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 5f1cc403a4..673806fdeb 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,10 +1,11 @@
-#;
+#;#;
 #<<END
-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
-0123
+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
+
 END
+"0123"
 #lang typed/scheme
 #:optimize
 (for ([i 4])
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 5262c2f278..48ffc78d4a 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,10 +1,11 @@
-#;
+#;#;
 #<<END
-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
-123
+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
+
 END
+"123"
 #lang typed/scheme
 #:optimize
 (for: ((i : Char "123"))
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 04b20c903e..fcf9bfa250 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,10 +1,11 @@
-#;
+#;#;
 #<<END
-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
-123
+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
+
 END
+"123"
 #lang typed/scheme
 #:optimize
 (for: ((i : Integer (vector 1 2 3)))
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 7a1c69b6e0..58a729c810 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR info: invalid-binary-nonzero-fixnum.rkt 11:3 display -- hidden parameter
+TR info: invalid-binary-nonzero-fixnum.rkt 12:3 display -- hidden parameter
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 7581768a28..913666a152 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,9 +1,10 @@
-#;
+#;#;
 #<<END
-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)
+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)
 
 END
+""
 
 #lang typed/racket #:optimize
 
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 143e2e1ac8..bb8e788f9b 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: invalid-exact-inexact.rkt 13:0 (exact->inexact 1.0) -- float to float
+
+END
 #<<END
-TR opt: invalid-exact-inexact.rkt 10:0 (exact->inexact 1.0) -- float to float
 1.0
 
 END
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 b7b020e361..a1bcbfc9fc 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,4 +1,7 @@
-#;
+#;#;
+#<<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 d0556b3864..474d2c61c7 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,9 +1,12 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR missed opt: invalid-float-promotion.rkt 14:0 (/ (ann 1 Integer) 2.0) -- all args float-arg-expr, result not Float -- caused by: 14:8 1
-TR info: invalid-float-promotion.rkt 14:0 (/ (ann 1 Integer) 2.0) -- exact real arith
-TR missed opt: invalid-float-promotion.rkt 15:0 (* (ann 2/3 Exact-Rational) 3.0) -- all args float-arg-expr, result not Float -- caused by: 15:8 2/3
-TR info: invalid-float-promotion.rkt 15:0 (* (ann 2/3 Exact-Rational) 3.0) -- exact real arith
 0.5
 2.0
 
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 da0a647bfe..957c599888 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR missed opt: invalid-fxquotient.rkt 16:21 (quotient fixnum-min -1) -- out of fixnum range
+
+END
 #<<END
-TR missed opt: invalid-fxquotient.rkt 13:21 (quotient fixnum-min -1) -- out of fixnum range
 #t
 
 END
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 f41d8b37cb..5b3a3c8205 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,4 +1,7 @@
-#;
+#;#;
+#<<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 92cf9bf70f..a11dcf0f1e 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR missed opt: invalid-log-complex.rkt 14:11 (log (ann 2.0 Float)) -- unexpected complex type
+
+END
 #<<END
-TR missed opt: invalid-log-complex.rkt 11:11 (log (ann 2.0 Float)) -- unexpected complex type
 0.6931471805599453
 
 END
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 1356ccdbf2..a0cdcaad81 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,4 +1,7 @@
-#;
+#;#;
+#<<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 3c9a54b0ef..c6b7766157 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,4 +1,7 @@
-#;
+#;#;
+#<<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 379dc0a4aa..9eb7207f23 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR missed opt: invalid-mpair.rkt 11:2 (mcar x) -- car/cdr on a potentially empty list -- caused by: 11:8 x
+TR missed opt: invalid-mpair.rkt 12:2 (mcar x) -- car/cdr on a potentially empty list -- caused by: 12:8 x
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 c4b7e4e72f..3ec2a8e79c 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR missed opt: invalid-sqrt.rkt 13:0 (sqrt -2.0) -- unexpected complex type
+
+END
 #<<END
-TR missed opt: invalid-sqrt.rkt 10:0 (sqrt -2.0) -- unexpected complex type
 0+1.4142135623730951i
 
 END
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 4ea78c95cb..ecc9b77dd7 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,30 +1,31 @@
-#;
+#;#;
 #<<END
-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 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 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
-6.0+12.0i7.0+14.0i1.0+2.0i1
+TR info: invalid-unboxed-let.rkt 40:3 display -- hidden parameter
+
 END
+"6.0+12.0i7.0+14.0i1.0+2.0i1"
 
 #lang typed/scheme
 #:optimize
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 b640523164..c17f73700a 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,14 +1,17 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: invalid-unboxed-let2.rkt 22:33 1.0+2.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 22:42 2.0+4.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 22:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let2.rkt 22:55 3.0+6.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 22:64 4.0+8.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 22:52 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let2.rkt 23:5 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let2.rkt 23:8 t2 -- unbox float-complex
-TR opt: invalid-unboxed-let2.rkt 23:2 (+ t1 t2) -- unboxed binary float complex
 10.0+20.0i
 
 END
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 08b277eab3..e8b6afef71 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: invalid-vector-ref.rkt 11:2 (vector-ref x 0) -- vector partial bounds checking elimination
+TR opt: invalid-vector-ref.rkt 12:2 (vector-ref x 0) -- vector partial bounds checking elimination
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 4c5d2c3b1a..5d047db5b7 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: invalid-vector-set.rkt 11:2 (vector-set! x 0 2) -- vector partial bounds checking elimination
+TR opt: invalid-vector-set.rkt 12:2 (vector-set! x 0 2) -- vector partial bounds checking elimination
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 cc53793d10..e23e3cadbe 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
@@ -1,18 +1,21 @@
-#;
+#;#;
+#<<END
+TR opt: known-length-lists.rkt 42:0 (length l) -- known-length list length
+TR opt: known-length-lists.rkt 43:0 (list-ref l i) -- known-length list op
+TR opt: known-length-lists.rkt 44:0 (list-ref l j) -- known-length list op
+TR opt: known-length-lists.rkt 45:0 (list-ref l k) -- known-length list op
+TR opt: known-length-lists.rkt 46:0 (list-tail l i) -- known-length list op
+TR opt: known-length-lists.rkt 47:0 (list-tail l j) -- known-length list op
+TR opt: known-length-lists.rkt 48:0 (list-tail l k) -- known-length list op
+TR opt: known-length-lists.rkt 49:0 (list-ref l 0) -- known-length list op
+TR opt: known-length-lists.rkt 50:0 (list-ref l 1) -- known-length list op
+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
-TR opt: known-length-lists.rkt 40:0 (length l) -- known-length list length
-TR opt: known-length-lists.rkt 41:0 (list-ref l i) -- known-length list op
-TR opt: known-length-lists.rkt 42:0 (list-ref l j) -- known-length list op
-TR opt: known-length-lists.rkt 43:0 (list-ref l k) -- known-length list op
-TR opt: known-length-lists.rkt 44:0 (list-tail l i) -- known-length list op
-TR opt: known-length-lists.rkt 45:0 (list-tail l j) -- known-length list op
-TR opt: known-length-lists.rkt 46:0 (list-tail l k) -- known-length list op
-TR opt: known-length-lists.rkt 47:0 (list-ref l 0) -- known-length list op
-TR opt: known-length-lists.rkt 48:0 (list-ref l 1) -- known-length list op
-TR opt: known-length-lists.rkt 49:0 (list-ref l 2) -- known-length list op
-TR opt: known-length-lists.rkt 50:0 (list-tail l 0) -- known-length list op
-TR opt: known-length-lists.rkt 51:0 (list-tail l 1) -- known-length list op
-TR opt: known-length-lists.rkt 52:0 (list-tail l 2) -- known-length list op
 '(1 2 3)
 3
 1
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 beffabf03d..c897256e88 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: known-vector-length.rkt 12:5 (vector-length (ann (vector 1 2) (Vector Integer Integer))) -- known-length vector-length
-TR opt: known-vector-length.rkt 12:0 (+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer)))) -- fixnum bounded expr
 4
 
 END
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 a2d74aed26..b85409e39a 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: let-float.rkt 12:9 (+ 3.0 2.0) -- binary float
-TR opt: let-float.rkt 13:2 (* 9.0 x) -- binary float
 45.0
 
 END
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 bcf2026e41..20e23beb75 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: let-rhs.rkt 16:9 (+ 1.0 2.0) -- binary float
+
+END
 #<<END
-TR opt: let-rhs.rkt 13:9 (+ 1.0 2.0) -- binary float
 3.0
 
 END
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 b21c13885f..4bb94472e9 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,18 +1,21 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: list.rkt 28:0 (first l) -- pair
-TR opt: list.rkt 29:0 (rest l) -- pair
-TR opt: list.rkt 30:0 (second l) -- pair
-TR opt: list.rkt 30:0 (second l) -- pair
-TR missed opt: list.rkt 31:0 (rest (rest l)) -- car/cdr on a potentially empty list -- caused by: 31:6 (rest l)
-TR opt: list.rkt 31:6 (rest l) -- pair
-TR opt: list.rkt 32:0 (third l) -- pair
-TR opt: list.rkt 32:0 (third l) -- pair
-TR opt: list.rkt 32:0 (third l) -- pair
-TR opt: list.rkt 33:0 (fourth l) -- pair
-TR opt: list.rkt 33:0 (fourth l) -- pair
-TR opt: list.rkt 33:0 (fourth l) -- pair
-TR opt: list.rkt 33:0 (fourth l) -- pair
 1
 '(2 3 4)
 2
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 f6c3bc65fe..4030f81314 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: literal-int.rkt 17:0 (+ 1 2.0) -- binary float
+
+END
 #<<END
-TR opt: literal-int.rkt 14:0 (+ 1 2.0) -- binary float
 3.0
 1
 
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 b6f46a48ea..1c93958b6b 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: magnitude.rkt 14:11 3.0+4.0i -- unboxed literal
-TR opt: magnitude.rkt 14:0 (magnitude 3.0+4.0i) -- unboxed unary float complex
 5.0
 
 END
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 b264560b97..2c856e82ff 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: make-flrectangular.rkt 13:0 (make-rectangular 1.0 2.2) -- binary float comp
-TR opt: make-flrectangular.rkt 14:0 (make-flrectangular 1.0 2.2) -- binary float comp
 1.0+2.2i
 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 a8c630dcf8..384133c63d 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,19 +1,22 @@
-#;
+#;#;
 #<<END
-TR opt: make-polar.rkt 28:6 (make-polar 1.0 1.0) -- make-rectangular elimination
-TR opt: make-polar.rkt 28:6 (make-polar 1.0 1.0) -- make-polar
-TR opt: make-polar.rkt 32:50 p -- unbox float-complex
-TR opt: make-polar.rkt 32:39 (real-part p) -- unboxed unary float complex
-TR opt: make-polar.rkt 31:12 1.0+2.0i -- unboxed literal
-TR opt: make-polar.rkt 31:21 (make-polar 2.0 4.0) -- make-rectangular elimination
-TR opt: make-polar.rkt 31:9 (+ 1.0+2.0i (make-polar 2.0 4.0)) -- unboxed binary float complex
-TR opt: make-polar.rkt 31: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 32:50 p -- unboxed complex variable
-TR opt: make-polar.rkt 32:50 p -- leave var unboxed
-TR opt: make-polar.rkt 32:39 (real-part p) -- complex accessor elimination
+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 (imag-part p) -- complex accessor elimination
+TR opt: make-polar.rkt 33:39 (real-part p) -- complex accessor elimination
+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
+
+END
+#<<END
 "-0.3070.486"
 
 END
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 7adbb4c04a..eeec8960cd 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,8 +1,11 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: maybe-exact-complex.rkt 15:3 1.0+2.0i -- unboxed literal
-TR opt: maybe-exact-complex.rkt 15:12 2+4i -- unboxed literal
-TR opt: maybe-exact-complex.rkt 15:0 (+ 1.0+2.0i 2+4i) -- unboxed binary float complex
 3.0+6.0i
 
 END
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 bd76315a0e..ea4f5b5287 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: module-path.rkt 16:0 (unless (module-path? 2) #f) -- dead then branch
+
+END
 #<<END
-TR opt: module-path.rkt 13:0 (unless (module-path? 2) #f) -- dead then branch
 #t
 #f
 #f
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 bc4fc0a529..ac2446ec52 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,12 +1,15 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: mpair.rkt 20:0 (mcar x) -- pair
-TR opt: mpair.rkt 21:0 (mcdr x) -- pair
-TR opt: mpair.rkt 22:0 (set-mcar! x (+ 1 2)) -- pair
-TR opt: mpair.rkt 22:13 (+ 1 2) -- fixnum bounded expr
-TR opt: mpair.rkt 23:0 (set-mcdr! x (+ 1.0 2.0)) -- pair
-TR opt: mpair.rkt 23:13 (+ 1.0 2.0) -- binary float
-TR opt: mpair.rkt 29:6 (mcar x) -- pair
 1
 1.0
 
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 f1d4a0d48a..8eb0b3e09f 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,11 +1,14 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: multi-flcomp.rkt 19:0 (<= 1.0 2.0 3.0) -- multi float comp
-TR opt: multi-flcomp.rkt 21:0 (<= 1.0 2.0 3.0 4.0) -- multi float comp
-TR opt: multi-flcomp.rkt 22:16 (+ 2.0 2.0) -- binary float
-TR opt: multi-flcomp.rkt 22:0 (<= 1.0 2.0 3.0 (+ 2.0 2.0)) -- multi float comp
-TR opt: multi-flcomp.rkt 23:12 (+ 2.0 2.0) -- binary float
-TR opt: multi-flcomp.rkt 23:0 (<= 1.0 2.0 (+ 2.0 2.0) 3.0) -- multi float comp
 #t
 #t
 #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 8fb8310397..66d6fe31f2 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,10 +1,13 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: n-ary-float-complex.rkt 15:3 1.0+2.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 15:12 2.0+4.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 15:21 3.0+6.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 15:30 4.0+8.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 15:0 (+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
 10.0+20.0i
 
 END
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 ad0ed2e654..1e5db5d844 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: n-ary-float.rkt 14:0 (+ 1.0 2.0 3.0) -- binary float
+
+END
 #<<END
-TR opt: n-ary-float.rkt 11:0 (+ 1.0 2.0 3.0) -- binary float
 6.0
 
 END
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 dd4e520065..861a150dfe 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,10 +1,13 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: nested-float-complex.rkt 15:3 1.0+2.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 15:15 2.0+4.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 15:24 3.0+6.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 15:12 (- 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: nested-float-complex.rkt 15:0 (+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i)) -- unboxed binary float complex
 0.0+0.0i
 
 END
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 5af3a2bf9f..48e9d4aac4 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: nested-float.rkt 12:7 (+ 3.0 4.0) -- binary float
-TR opt: nested-float.rkt 12:0 (+ 2.0 (+ 3.0 4.0)) -- binary float
 9.0
 
 END
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 d0dd1b6027..c60a95121d 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: nested-float2.rkt 12:7 (* 3.0 4.0) -- binary float
-TR opt: nested-float2.rkt 12:0 (+ 2.0 (* 3.0 4.0)) -- binary float
 14.0
 
 END
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 d563a4c5d3..3f8c225664 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,37 +1,40 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: nested-let-loop.rkt 51:38 r -- unbox float-complex
-TR opt: nested-let-loop.rkt 51:40 s -- unbox float-complex
-TR opt: nested-let-loop.rkt 51:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 44:8 r -- unboxed var -> table
-TR opt: nested-let-loop.rkt 42:6 loop1 -- fun -> unboxed fun
-TR opt: nested-let-loop.rkt 46:10 r -- unboxed complex variable
-TR opt: nested-let-loop.rkt 51:38 r -- leave var unboxed
-TR opt: nested-let-loop.rkt 51:40 s -- unbox float-complex
-TR opt: nested-let-loop.rkt 51:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 49:18 s -- unboxed var -> table
-TR opt: nested-let-loop.rkt 47:16 loop2 -- fun -> unboxed fun
-TR opt: nested-let-loop.rkt 51:38 r -- leave var unboxed
-TR opt: nested-let-loop.rkt 51:40 s -- leave var unboxed
-TR opt: nested-let-loop.rkt 51:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 51:20 (loop1 (cdr x) (+ r s)) -- unboxed call site
-TR opt: nested-let-loop.rkt 51:27 (cdr x) -- pair
-TR opt: nested-let-loop.rkt 51:20 (loop1 (cdr x) (+ r s)) -- call to fun with unboxed args
-TR opt: nested-let-loop.rkt 52:38 s -- leave var unboxed
-TR opt: nested-let-loop.rkt 52:40 (car x) -- unbox float-complex
-TR opt: nested-let-loop.rkt 52:40 (car x) -- pair
-TR opt: nested-let-loop.rkt 52:48 (car y) -- unbox float-complex
-TR opt: nested-let-loop.rkt 52:48 (car y) -- pair
-TR opt: nested-let-loop.rkt 52:35 (+ s (car x) (car y)) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 52:20 (loop2 (cdr y) (+ s (car x) (car y))) -- unboxed call site
-TR opt: nested-let-loop.rkt 52:27 (cdr y) -- pair
-TR opt: nested-let-loop.rkt 52:20 (loop2 (cdr y) (+ s (car x) (car y))) -- call to fun with unboxed args
-TR opt: nested-let-loop.rkt 49:38 0.0+0.0i -- unboxed literal
-TR opt: nested-let-loop.rkt 47: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 47:16 loop2 -- unboxed let loop
-TR opt: nested-let-loop.rkt 44:28 0.0+0.0i -- unboxed literal
-TR opt: nested-let-loop.rkt 42: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 42:6 loop1 -- unboxed let loop
 20.0+40.0i
 
 END
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 c6623ac318..fc4c88a9a7 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: nested-pair1.rkt 12:0 (car (cdr (quote (1 2)))) -- pair
-TR opt: nested-pair1.rkt 12:5 (cdr (quote (1 2))) -- pair
 2
 
 END
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 4946e2bb14..9e3533946d 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: nested-pair2.rkt 12:0 (car (cdr (cons 3 (cons (cons 2 (quote ())) 1)))) -- pair
-TR opt: nested-pair2.rkt 12:5 (cdr (cons 3 (cons (cons 2 (quote ())) 1))) -- pair
 '(2)
 
 END
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 202d42bc7c..ecfa6dd447 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,22 +1,25 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: nested-unboxed-let.rkt 28:14 x -- unbox float-complex
-TR opt: nested-unboxed-let.rkt 28:16 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 28:11 (+ x 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 27:12 1.0+2.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 27:21 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 27:9 (+ 1.0+2.0i 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 27: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 29:7 x -- unbox float-complex
-TR opt: nested-unboxed-let.rkt 29:9 3.0+6.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 29:4 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 28:14 x -- leave var unboxed
-TR opt: nested-unboxed-let.rkt 28:16 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 28:11 (+ x 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 28:2 (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i)) -- unboxed let bindings
-TR opt: nested-unboxed-let.rkt 29:7 x -- leave var unboxed
-TR opt: nested-unboxed-let.rkt 29:9 3.0+6.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 29:4 (+ x 3.0+6.0i) -- unboxed binary float complex
 8.0+14.0i
 
 END
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 df40403716..de4bac9ca9 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,20 +1,23 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: one-arg-arith.rkt 41:0 (- 12) -- unary fixnum
-TR opt: one-arg-arith.rkt 42:0 (- 12.0) -- unary float
-TR opt: one-arg-arith.rkt 43:0 (/ 4.2) -- unary float
-TR opt: one-arg-arith.rkt 45:0 (+ 1) -- unary number
-TR opt: one-arg-arith.rkt 46:0 (+ 1.0) -- unary number
-TR opt: one-arg-arith.rkt 47:0 (+ (expt 2 100)) -- unary number
-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 (min 1) -- unary number
-TR opt: one-arg-arith.rkt 52:0 (min 1.0) -- unary number
-TR opt: one-arg-arith.rkt 53:0 (min (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 54:0 (max 1) -- unary number
-TR opt: one-arg-arith.rkt 55:0 (max 1.0) -- unary number
-TR opt: one-arg-arith.rkt 56:0 (max (expt 2 100)) -- unary number
 -12
 -12.0
 0.23809523809523808
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 cf23c4f4dd..58846720bc 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: pair-fun.rkt 14:6 (car x) -- pair
+TR opt: pair-fun.rkt 15:6 (car x) -- pair
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 c5c9248176..bc7d9911ab 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,17 +1,20 @@
-#;
+#;#;
+#<<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 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 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
-TR opt: pair-known-length-list.rkt 28:0 (car x) -- pair
-TR opt: pair-known-length-list.rkt 29:0 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 30:0 (car (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 30:5 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 31:0 (cdr (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 31:5 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 32:0 (car (cdr (cdr x))) -- pair
-TR opt: pair-known-length-list.rkt 32:5 (cdr (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 32:10 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 33:0 (cdr (cdr (cdr x))) -- pair
-TR opt: pair-known-length-list.rkt 33:5 (cdr (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 33:10 (cdr x) -- pair
 1
 '(2 3)
 2
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 a26360f8c3..f1da175418 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
@@ -1,37 +1,40 @@
-#;
+#;#;
+#<<END
+TR opt: pr13468.rkt 90:13 6.0+2.3i -- unboxed literal
+TR opt: pr13468.rkt 90:13 6.0+2.3i -- unboxed literal
+TR opt: pr13468.rkt 90:5 (- (ann 6.0+2.3i Float-Complex)) -- unboxed unary float complex
+TR opt: pr13468.rkt 91:13 6.0+2.3i -- unboxed literal
+TR opt: pr13468.rkt 91:13 6.0+2.3i -- unboxed literal
+TR opt: pr13468.rkt 91:5 (/ (ann 6.0+2.3i Float-Complex)) -- unboxed unary float complex
+TR missed opt: pr13468.rkt 92:5 (/ (ann 0.0+0.0i Float-Complex) (ann 1 Number)) -- Float-Complex division, potential exact 0s on the rhss -- caused by: 92:42 1
+TR missed opt: pr13468.rkt 95:5 (expt (ann -5.0 Flonum) (ann 2.0 Flonum)) -- unexpected complex type
+TR opt: pr13468.rkt 116:21 0.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 116:5 (magnitude (ann 0.0 Flonum-Zero)) -- unboxed unary float complex
+TR opt: pr13468.rkt 117:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 117:5 (magnitude (ann 6.0 Positive-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 118:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 118:5 (magnitude (ann 6.0 Nonnegative-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 119:21 -6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 119:5 (magnitude (ann -6.0 Nonpositive-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 120:21 -6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 120:5 (magnitude (ann -6.0 Negative-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 121:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 121:5 (magnitude (ann 6.0 Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 142:21 0.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 142:5 (real-part (ann 0.0 Flonum-Zero)) -- unboxed unary float complex
+TR opt: pr13468.rkt 143:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 143:5 (real-part (ann 6.0 Positive-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 144:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 144:5 (real-part (ann 6.0 Nonnegative-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 145:21 -6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 145:5 (real-part (ann -6.0 Nonpositive-Flonum)) -- unboxed unary float complex
+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
-TR opt: pr13468.rkt 88:13 6.0+2.3i -- unboxed literal
-TR opt: pr13468.rkt 88:13 6.0+2.3i -- unboxed literal
-TR opt: pr13468.rkt 88:5 (- (ann 6.0+2.3i Float-Complex)) -- unboxed unary float complex
-TR opt: pr13468.rkt 89:13 6.0+2.3i -- unboxed literal
-TR opt: pr13468.rkt 89:13 6.0+2.3i -- unboxed literal
-TR opt: pr13468.rkt 89:5 (/ (ann 6.0+2.3i Float-Complex)) -- unboxed unary float complex
-TR missed opt: pr13468.rkt 90:5 (/ (ann 0.0+0.0i Float-Complex) (ann 1 Number)) -- Float-Complex division, potential exact 0s on the rhss -- caused by: 90:42 1
-TR missed opt: pr13468.rkt 93:5 (expt (ann -5.0 Flonum) (ann 2.0 Flonum)) -- unexpected complex type
-TR opt: pr13468.rkt 114:21 0.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 114:5 (magnitude (ann 0.0 Flonum-Zero)) -- unboxed unary float complex
-TR opt: pr13468.rkt 115:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 115:5 (magnitude (ann 6.0 Positive-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 116:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 116:5 (magnitude (ann 6.0 Nonnegative-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 117:21 -6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 117:5 (magnitude (ann -6.0 Nonpositive-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 118:21 -6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 118:5 (magnitude (ann -6.0 Negative-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 119:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 119:5 (magnitude (ann 6.0 Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 140:21 0.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 140:5 (real-part (ann 0.0 Flonum-Zero)) -- unboxed unary float complex
-TR opt: pr13468.rkt 141:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 141:5 (real-part (ann 6.0 Positive-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 142:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 142:5 (real-part (ann 6.0 Nonnegative-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 143:21 -6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 143:5 (real-part (ann -6.0 Nonpositive-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 144:21 -6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 144:5 (real-part (ann -6.0 Negative-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 145:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 145:5 (real-part (ann 6.0 Flonum)) -- unboxed unary float complex
 -6.0-2.3i
 0.1453136352627755-0.055703560184063944i
 0.0+0.0i
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 887c26c2f0..e2273e8e69 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: pr13788.rkt 13:0 (vector-length (vector 1 2 3)) -- known-length vector-length
+
+END
 #<<END
-TR opt: pr13788.rkt 10:0 (vector-length (vector 1 2 3)) -- known-length vector-length
 3
 
 END
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 524e571bfd..c6d83740ca 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,4 +1,7 @@
-#;
+#;#;
+#<<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 062ae35004..67b0b5890b 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: rational-literal.rkt 12:0 (+ 3/4 1.2) -- binary float
+
+END
 #<<END
-TR opt: rational-literal.rkt 9:0 (+ 3/4 1.2) -- binary float
 1.95
 
 END
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 60141c09ef..e79d3664d0 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
@@ -1,21 +1,24 @@
-#;
+#;#;
+#<<END
+TR opt: real-part-loop.rkt 32:20 v -- unbox float-complex
+TR opt: real-part-loop.rkt 32:9 (real-part v) -- unboxed unary float complex
+TR opt: real-part-loop.rkt 31:13 v -- unboxed var -> table
+TR opt: real-part-loop.rkt 31:6 loop -- fun -> unboxed fun
+TR opt: real-part-loop.rkt 32:20 v -- unboxed complex variable
+TR opt: real-part-loop.rkt 32:20 v -- leave var unboxed
+TR opt: real-part-loop.rkt 32:9 (real-part v) -- complex accessor elimination
+TR opt: real-part-loop.rkt 32:6 (> (real-part v) 70000.2) -- binary float comp
+TR opt: real-part-loop.rkt 34:15 v -- leave var unboxed
+TR opt: real-part-loop.rkt 34:17 3.6 -- float-arg-expr in complex ops
+TR opt: real-part-loop.rkt 34:12 (+ v 3.6) -- unboxed binary float complex
+TR opt: real-part-loop.rkt 34:6 (loop (+ v 3.6)) -- unboxed call site
+TR opt: real-part-loop.rkt 34:6 (loop (+ v 3.6)) -- call to fun with unboxed args
+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
-TR opt: real-part-loop.rkt 30:20 v -- unbox float-complex
-TR opt: real-part-loop.rkt 30:9 (real-part v) -- unboxed unary float complex
-TR opt: real-part-loop.rkt 29:13 v -- unboxed var -> table
-TR opt: real-part-loop.rkt 29:6 loop -- fun -> unboxed fun
-TR opt: real-part-loop.rkt 30:20 v -- unboxed complex variable
-TR opt: real-part-loop.rkt 30:20 v -- leave var unboxed
-TR opt: real-part-loop.rkt 30:9 (real-part v) -- complex accessor elimination
-TR opt: real-part-loop.rkt 30:6 (> (real-part v) 70000.2) -- binary float comp
-TR opt: real-part-loop.rkt 32:15 v -- leave var unboxed
-TR opt: real-part-loop.rkt 32:17 3.6 -- float-arg-expr in complex ops
-TR opt: real-part-loop.rkt 32:12 (+ v 3.6) -- unboxed binary float complex
-TR opt: real-part-loop.rkt 32:6 (loop (+ v 3.6)) -- unboxed call site
-TR opt: real-part-loop.rkt 32:6 (loop (+ v 3.6)) -- call to fun with unboxed args
-TR opt: real-part-loop.rkt 29:15 0.0+1.0i -- unboxed literal
-TR opt: real-part-loop.rkt 29: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 29:6 loop -- unboxed let loop
 0
 
 END
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 9b3d9a49f7..3bbdb76c54 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: silent-dead-branch.rkt 13:0 (when (number? "1") 1) -- dead then branch
+TR opt: silent-dead-branch.rkt 14:0 (when (number? "1") 1) -- dead then branch
 
 END
+""
 
 #lang typed/racket
 
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 3994fc6fba..240a7ed753 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: simple-float.rkt 14:0 (+ 2.0 3.0) -- binary float
+
+END
 #<<END
-TR opt: simple-float.rkt 11:0 (+ 2.0 3.0) -- binary float
 5.0
 
 END
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 73cf09296f..44db124380 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: simple-pair.rkt 14:0 (car (cons 1 2)) -- pair
+
+END
 #<<END
-TR opt: simple-pair.rkt 11:0 (car (cons 1 2)) -- pair
 1
 
 END
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 c78d784d25..6fda6a12dc 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,10 +1,11 @@
-#;
+#;#;
 #<<END
-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
+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
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 4f6b16f0b3..52f913943d 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: sqrt.rkt 12:2 (sqrt x) -- unary float
+TR opt: sqrt.rkt 13:2 (sqrt x) -- unary float
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 fdddc7e259..747f5561af 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: string-length.rkt 15:0 (string-length "eh") -- string-length
-TR opt: string-length.rkt 16:0 (bytes-length #"eh") -- bytes-length
 2
 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 dbb9429c6f..de2f983e45 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,8 +1,11 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR info: structs.rkt 13:11 pt -- struct constructor
-TR opt: structs.rkt 14:0 (pt-x a) -- struct ref
-TR opt: structs.rkt 15:0 (set-pt-y! a 5) -- struct set
 3
 
 END
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 55dee125ba..1fa86c7d33 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: ternary-equality.rkt 16:0 (= 1 1 1) -- multi fixnum comp
+
+END
 #<<END
-TR opt: ternary-equality.rkt 13:0 (= 1 1 1) -- multi fixnum comp
 #t
 
 END
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 a519847746..51e414d16d 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,8 +1,11 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unary-fixnum-nested.rkt 13:26 (length (quote (1 2 3))) -- known-length list length
-TR opt: unary-fixnum-nested.rkt 13:13 (bitwise-not (length (quote (1 2 3)))) -- unary fixnum
-TR opt: unary-fixnum-nested.rkt 13:0 (bitwise-not (bitwise-not (length (quote (1 2 3))))) -- unary fixnum
 3
 
 END
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 8b94e656f5..feaa23ed87 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,7 +1,10 @@
-#;
+#;#;
 #<<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
+
+END
+#<<END
 -5
 -2
 2
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 133047baf7..05bd72fba9 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: unary-float.rkt 14:0 (sin 2.0) -- unary float
+
+END
 #<<END
-TR opt: unary-float.rkt 11:0 (sin 2.0) -- unary float
 0.9092974268256817
 
 END
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 5f5a9caff1..1272ddffba 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,19 +1,22 @@
-#;
+#;#;
+#<<END
+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
+
+END
 #<<END
-TR opt: unboxed-exp.rkt 30:50 p -- unbox float-complex
-TR opt: unboxed-exp.rkt 30:39 (real-part p) -- complex accessor elimination
-TR opt: unboxed-exp.rkt 31:50 p -- unbox float-complex
-TR opt: unboxed-exp.rkt 31:39 (imag-part p) -- complex accessor elimination
-TR opt: unboxed-exp.rkt 33:30 2.0+3.4i -- unboxed literal
-TR opt: unboxed-exp.rkt 33:25 (exp 2.0+3.4i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 34:30 0.0+0.0i -- unboxed literal
-TR opt: unboxed-exp.rkt 34:25 (exp 0.0+0.0i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 35:30 -12.2-4.7i -- unboxed literal
-TR opt: unboxed-exp.rkt 35:25 (exp -12.2-4.7i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 36:30 12.2-4.7i -- unboxed literal
-TR opt: unboxed-exp.rkt 36:25 (exp 12.2-4.7i) -- 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
 "-7.14373-1.88821"
 "1.000000.00000"
 "-0.000000.00001"
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 eb6bdaeb39..f98cc2c3d5 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,39 +1,42 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-for.rkt 41:0 #%module-begin -- in-list
-TR opt: unboxed-for.rkt 46:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 46:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 46:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 46:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 46:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 46:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 44:31 sum -- unboxed var -> table
-TR opt: unboxed-for.rkt 44: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 44:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 46:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 46:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 46:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 44: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 44: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 45:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 45:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 46:9 i -- leave var unboxed
-TR opt: unboxed-for.rkt 46:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 46:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 44:31 sum -- leave var unboxed
-TR opt: unboxed-for.rkt 44: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 46:9 i -- leave var unboxed
-TR opt: unboxed-for.rkt 46:11 sum -- leave var unboxed
-TR opt: unboxed-for.rkt 46:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 45:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 44:31 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 44: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 44: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 44:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 44:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 44:53 0.0+0.0i -- unboxed literal
-TR opt: unboxed-for.rkt 44: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 44: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
 3.0+6.0i
 
 END
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 053d80d847..cb98022e81 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,18 +1,21 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let-functions1.rkt 24:45 x -- unbox float-complex
-TR opt: unboxed-let-functions1.rkt 24:47 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 24:42 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 24:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions1.rkt 24:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions1.rkt 24:45 x -- leave var unboxed
-TR opt: unboxed-let-functions1.rkt 24:47 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 24:42 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 25:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 25:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 25:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 25:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
-TR opt: unboxed-let-functions1.rkt 25:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
 6.0+12.0i
 
 END
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 e4ddc5bc85..e49cf7a3aa 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,23 +1,26 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let-functions2.rkt 30:21 x -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 30:23 y -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 30:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 29:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions2.rkt 30:21 x -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 30:23 y -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 30:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 29:42 y -- unboxed var -> table
-TR opt: unboxed-let-functions2.rkt 29:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions2.rkt 30:21 x -- leave var unboxed
-TR opt: unboxed-let-functions2.rkt 30:23 y -- leave var unboxed
-TR opt: unboxed-let-functions2.rkt 30:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 31:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 31:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 31:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 32:5 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 31:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- unboxed call site
-TR opt: unboxed-let-functions2.rkt 31:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- call to fun with unboxed args
 6.0+12.0i
 
 END
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 32fcb5d80b..562a4248ba 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,18 +1,21 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let-functions3.rkt 25:21 x -- unbox float-complex
-TR opt: unboxed-let-functions3.rkt 25:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions3.rkt 25:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 24:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions3.rkt 24:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions3.rkt 25:21 x -- leave var unboxed
-TR opt: unboxed-let-functions3.rkt 25:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions3.rkt 25:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 26:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions3.rkt 26:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions3.rkt 26:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 26:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- unboxed call site
-TR opt: unboxed-let-functions3.rkt 26:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- call to fun with unboxed args
 6.0+6.0i
 
 END
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 844d641b88..e8ca1f970b 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,18 +1,21 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let-functions4.rkt 25:21 x -- unbox float-complex
-TR opt: unboxed-let-functions4.rkt 25:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions4.rkt 25:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 24:32 x -- unboxed var -> table
-TR opt: unboxed-let-functions4.rkt 24:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions4.rkt 25:21 x -- leave var unboxed
-TR opt: unboxed-let-functions4.rkt 25:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions4.rkt 25:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 27:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions4.rkt 27:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions4.rkt 27:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 26:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
-TR opt: unboxed-let-functions4.rkt 26:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
 6.0+6.0i
 
 END
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 cfd3e3a07a..6258065500 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,8 +1,11 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let-functions5.rkt 20:15 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions5.rkt 20:24 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions5.rkt 20:12 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 3.0+6.0i
 
 END
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 05b3bdbc87..190e04cf5d 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,23 +1,26 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let-functions6.rkt 31:13 z -- unbox float-complex
-TR opt: unboxed-let-functions6.rkt 31:15 0.0+1.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 31:10 (+ z 0.0+1.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 28:31 z -- unboxed var -> table
-TR opt: unboxed-let-functions6.rkt 28:6 loop -- fun -> unboxed fun
-TR opt: unboxed-let-functions6.rkt 31:13 z -- leave var unboxed
-TR opt: unboxed-let-functions6.rkt 31:15 0.0+1.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 31:10 (+ z 0.0+1.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 32:19 z -- leave var unboxed
-TR opt: unboxed-let-functions6.rkt 32:21 (car l) -- pair
-TR opt: unboxed-let-functions6.rkt 32:21 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions6.rkt 32:16 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 32:10 (loop (+ z (car l)) (cdr l)) -- unboxed call site
-TR opt: unboxed-let-functions6.rkt 33:16 (cdr l) -- pair
-TR opt: unboxed-let-functions6.rkt 32:10 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions6.rkt 28:51 0.0+0.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 28: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 28:6 loop -- unboxed let loop
 6.0+1.0i
 
 END
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 4e32a365d0..a6ccfc59c4 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,22 +1,25 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let-functions7.rkt 32:15 z -- unbox float-complex
-TR opt: unboxed-let-functions7.rkt 32:17 (car l) -- pair
-TR opt: unboxed-let-functions7.rkt 32:17 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions7.rkt 32:12 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions7.rkt 28:31 z -- unboxed var -> table
-TR opt: unboxed-let-functions7.rkt 28:6 loop -- fun -> unboxed fun
-TR opt: unboxed-let-functions7.rkt 31:6 z -- unboxed complex variable
-TR opt: unboxed-let-functions7.rkt 32:15 z -- leave var unboxed
-TR opt: unboxed-let-functions7.rkt 32:17 (car l) -- pair
-TR opt: unboxed-let-functions7.rkt 32:17 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions7.rkt 32:12 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions7.rkt 32:6 (loop (+ z (car l)) (cdr l)) -- unboxed call site
-TR opt: unboxed-let-functions7.rkt 33:12 (cdr l) -- pair
-TR opt: unboxed-let-functions7.rkt 32:6 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions7.rkt 28:51 0.0+0.0i -- unboxed literal
-TR opt: unboxed-let-functions7.rkt 28: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 28:6 loop -- unboxed let loop
 6.0+0.0i
 
 END
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 5e3f37ca3c..146032d1bb 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,8 +1,11 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let-functions8.rkt 15:67 x -- unbox float-complex
-TR opt: unboxed-let-functions8.rkt 15:69 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions8.rkt 15:64 (+ x 2.0+4.0i) -- unboxed binary float complex
 3.0+6.0i
 
 END
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 eaa72cfdc7..98aeb2d105 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,27 +1,30 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let.rkt 35:14 t1 -- unbox float-complex
-TR opt: unboxed-let.rkt 35:17 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let.rkt 35:11 (- t1 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 34:14 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let.rkt 34:23 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let.rkt 34:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 34: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 37:5 t2 -- unbox float-complex
-TR opt: unboxed-let.rkt 37:8 t3 -- unbox float-complex
-TR opt: unboxed-let.rkt 37:2 (+ t2 t3) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 35:14 t1 -- leave var unboxed
-TR opt: unboxed-let.rkt 35:17 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let.rkt 35:11 (- t1 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 34: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 37:5 t2 -- leave var unboxed
-TR opt: unboxed-let.rkt 37:8 t3 -- unbox float-complex
-TR opt: unboxed-let.rkt 37:2 (+ t2 t3) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 36:11 4.0+8.0i -- unboxed literal
-TR opt: unboxed-let.rkt 34: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 37:5 t2 -- leave var unboxed
-TR opt: unboxed-let.rkt 37:8 t3 -- leave var unboxed
-TR opt: unboxed-let.rkt 37:2 (+ t2 t3) -- unboxed binary float complex
 4.0+8.0i
 
 END
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 9ec7acbe1c..77698bf17d 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,21 +1,24 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let2.rkt 28:5 t1 -- unbox float-complex
-TR opt: unboxed-let2.rkt 28:8 t2 -- unbox float-complex
-TR opt: unboxed-let2.rkt 28:2 (+ t1 t2) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 28:5 t1 -- unbox float-complex
-TR opt: unboxed-let2.rkt 28:8 t2 -- unbox float-complex
-TR opt: unboxed-let2.rkt 28:2 (+ t1 t2) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 26:13 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 26:22 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 26:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 27:13 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 27:22 4.0+8.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 27:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 26: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 28:5 t1 -- leave var unboxed
-TR opt: unboxed-let2.rkt 28:8 t2 -- leave var unboxed
-TR opt: unboxed-let2.rkt 28:2 (+ t1 t2) -- unboxed binary float complex
 10.0+20.0i
 
 END
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 14cf71c6a2..a79718364b 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,16 +1,19 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-let3.rkt 31:9 x -- unbox float-complex
-TR opt: unboxed-let3.rkt 31:11 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 31:6 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let3.rkt 28:12 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 28:21 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 28:9 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let3.rkt 28: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 30:6 x -- unboxed complex variable
-TR opt: unboxed-let3.rkt 31:9 x -- leave var unboxed
-TR opt: unboxed-let3.rkt 31:11 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 31:6 (+ x 2.0+4.0i) -- unboxed binary float complex
 3.0+6.0i
 
 END
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 75015b00a7..af602ddb29 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,15 +1,18 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-letrec-syntaxes+values.rkt 22:27 x -- unbox float-complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 22:29 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 22:24 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 21:33 1.0+2.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 21:42 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 21:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 20: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 22:27 x -- leave var unboxed
-TR opt: unboxed-letrec-syntaxes+values.rkt 22:29 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 22:24 (+ x 2.0+4.0i) -- unboxed binary float complex
 5.0+10.0i
 
 END
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 fe7be5cf79..1ad9209dc3 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,19 +1,22 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-letrec.rkt 29:5 x -- unbox float-complex
-TR opt: unboxed-letrec.rkt 29:7 y -- unbox float-complex
-TR opt: unboxed-letrec.rkt 29:2 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 29:5 x -- unbox float-complex
-TR opt: unboxed-letrec.rkt 29:7 y -- unbox float-complex
-TR opt: unboxed-letrec.rkt 29:2 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 27:31 1.0+2.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 28:34 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 28:43 3.0+6.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 28:31 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 26: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 29:5 x -- leave var unboxed
-TR opt: unboxed-letrec.rkt 29:7 y -- leave var unboxed
-TR opt: unboxed-letrec.rkt 29:2 (+ x y) -- unboxed binary float complex
 6.0+12.0i
 
 END
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 b275da06bb..548897016d 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,21 +1,24 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: unboxed-make-rectangular.rkt 31:5 x -- unbox float-complex
-TR opt: unboxed-make-rectangular.rkt 31:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 31:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 30:9 (make-rectangular 1.0 2.0) -- make-rectangular elimination
-TR opt: unboxed-make-rectangular.rkt 30:0 (let ((x (make-rectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-make-rectangular.rkt 31:5 x -- leave var unboxed
-TR opt: unboxed-make-rectangular.rkt 31:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 31: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 (unsafe-make-flrectangular 1.0 2.0) -- make-rectangular elimination
-TR opt: unboxed-make-rectangular.rkt 32:0 (let ((x (unsafe-make-flrectangular 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
 3.0+6.0i
 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 db155c3cf5..4505e46852 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: vector-bounds-check.rkt 26:0 (vector-ref (make-my-vector) 0) -- vector partial bounds checking elimination
-TR opt: vector-bounds-check.rkt 27:0 (flvector-ref (make-my-flvector) 0) -- flvector partial bounds checking elimination
 1.0
 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 a5782d5b17..97c339aef9 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,7 +1,8 @@
-#;
+#;#;
 #<<END
 
 END
+""
 #lang racket
 
 (define v (vector 'b 'a))
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 dd266d25e5..2431d2a280 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: vector-chaperone2.rkt 16:10 (vector-ref v i) -- vector partial bounds checking elimination
+
+END
 #<<END
-TR opt: vector-chaperone2.rkt 13:10 (vector-ref v i) -- vector partial bounds checking elimination
 'b
 
 END
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 fa8abee691..9b4b3357a7 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: vector-length-nested.rkt 12: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 13:1 (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0) -- vector
 2
 
 END
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 34034ee698..da78b21971 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,7 +1,10 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: vector-length.rkt 13:0 (vector-length (vector 1 2 3)) -- known-length vector-length
-TR opt: vector-length.rkt 14:0 (vector-length (ann (vector 4 5 6) (Vectorof Integer))) -- known-length vector-length
 3
 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 a4a2872e72..dd60fff2b3 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,8 +1,11 @@
-#;
+#;#;
+#<<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
+
+END
 #<<END
-TR opt: vector-ref-set-ref.rkt 16:0 (vector-ref x 0) -- vector
-TR opt: vector-ref-set-ref.rkt 17:0 (vector-set! x 1 "2") -- vector
-TR opt: vector-ref-set-ref.rkt 18:0 (vector-ref x 1) -- vector
 1
 "2"
 
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 1fd2599951..577fbed889 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: vector-ref.rkt 14:0 (vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0) -- vector
+
+END
 #<<END
-TR opt: vector-ref.rkt 11:0 (vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0) -- vector
 1
 
 END
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 65ea382e4f..7133d981d2 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: vector-ref2.rkt 14:0 (vector-ref (vector 1 2 3) 0) -- vector
+
+END
 #<<END
-TR opt: vector-ref2.rkt 11:0 (vector-ref (vector 1 2 3) 0) -- vector
 1
 
 END
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 0b13100703..4c46cd3af3 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: vector-set-quote.rkt 10:0 (vector-set! (ann (vector (quote (1 2))) (Vector Any)) 0 (quote (+ 1.0 2.0))) -- vector
+TR opt: vector-set-quote.rkt 11:0 (vector-set! (ann (vector (quote (1 2))) (Vector Any)) 0 (quote (+ 1.0 2.0))) -- vector
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 16cf04b826..8f0d67b62b 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: vector-set.rkt 10:0 (vector-set! (ann (vector 1 2) (Vector Integer Integer)) 0 1) -- vector
+TR opt: vector-set.rkt 11:0 (vector-set! (ann (vector 1 2) (Vector Integer Integer)) 0 1) -- vector
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 14df83e82a..4f4b464a1a 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,8 +1,9 @@
-#;
+#;#;
 #<<END
-TR opt: vector-set2.rkt 10:0 (vector-set! (vector 1 2) 0 2) -- vector
+TR opt: vector-set2.rkt 11:0 (vector-set! (vector 1 2) 0 2) -- vector
 
 END
+""
 
 #lang typed/scheme
 #:optimize
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 16b2b203f0..30add14afc 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,94 +1,95 @@
-#;
+#;#;
 #<<END
-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
+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
 
 END
+""
 
 #lang typed/racket
 
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 e171704bf3..c4f5b6a0e8 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,6 +1,9 @@
-#;
+#;#;
+#<<END
+TR opt: with-type.rkt 17:18 (#%app + x val) -- binary float
+
+END
 #<<END
-TR opt: with-type.rkt 14:18 (#%app + x val) -- binary float
 34.6
 
 END
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 9e92b63b64..3e5860fcab 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,8 +1,11 @@
-#;
+#;#;
+#<<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?
+
+END
 #<<END
-TR opt: zero.rkt 14:0 (zero? 1) -- fixnum zero?
-TR opt: zero.rkt 15:7 (sqrt 3.0) -- unary float
-TR opt: zero.rkt 15:0 (zero? (sqrt 3.0)) -- float zero?
 #f
 #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 33a32a7675..bf77c6276f 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
@@ -13,15 +13,23 @@
   ;; generate the new log, that will become the expected log
   (define-values (new-tr-log new-output) (generate-log file dir))
   (define in (open-input-file (build-path dir file)))
-  (read-line in) ; drop the #;
-  (read in) ; drop the old expected log
+  (read-line in) ; drop the #;#;
+  (read in) ; drop the old expected tr log
+  (read in) ; drop the old expected output
   (let ([rest (port->string in)])
     (with-output-to-file (build-path dir file) #:exists 'truncate
       (lambda ()
-        (displayln "#;")
+        (displayln "#;#;")
         (displayln "#<<END")
-        (display (string-append new-tr-log new-output))
-        (display "\nEND")
+        (displayln new-tr-log)
+        (displayln "END")
+        (if (regexp-match "\n" new-output)
+            (begin
+              (displayln "#<<END")
+              (displayln new-output)
+              (display "END"))
+            (begin
+              (write new-output)))
         (display rest)))))
 
 ;; proc returns the list of tests to be run on each file