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 4a61b27120..2a38cf8692 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,9 @@
 #;#;
 #<<END
-TR missed opt: all-real.rkt 29:0 (+ (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 29:8 3, 29:21 4
 TR info: all-real.rkt 29:0 (+ (ann 3 Real) (ann 4 Real)) -- exact real arith
-TR missed opt: all-real.rkt 30:0 (* (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 30:8 3, 30:21 4
 TR info: all-real.rkt 30:0 (* (ann 3 Real) (ann 4 Real)) -- exact real arith
+TR missed opt: all-real.rkt 29:0 (+ (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 29:8 3, 29:21 4
+TR 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
 END
 #<<END
 7
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/fixnum.rkt
index 111ec4abe0..7d61e9c009 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,19 @@
 #;#;
 #<<END
-TR opt: fixnum.rkt 38:10 (* x y) -- fixnum bounded expr
 TR missed opt: fixnum.rkt 41:0 (+ (ann z Fixnum) 234) -- out of fixnum range
 TR missed opt: fixnum.rkt 42:0 (* (ann x Index) (ann y Index)) -- out of fixnum range
-TR opt: fixnum.rkt 45:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 45:15 (+ 301 302) -- fixnum bounded expr
 TR missed opt: fixnum.rkt 45:0 (+ (+ 300 301) (+ 301 302)) -- out of fixnum range
-TR opt: fixnum.rkt 45:3 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 38:10 (* x y) -- fixnum bounded expr
+TR opt: fixnum.rkt 45:15 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum.rkt 45:15 (+ 301 302) -- fixnum bounded expr
 TR opt: fixnum.rkt 45:15 (+ 301 302) -- fixnum bounded expr
 TR opt: fixnum.rkt 45:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 45:15 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 46:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 45:3 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 45:3 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 46:17 (+ 301 302) -- fixnum bounded expr
 TR opt: fixnum.rkt 46:17 (+ 301 302) -- fixnum bounded expr
 TR opt: fixnum.rkt 46:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 46:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum.rkt 46:5 (+ 300 301) -- fixnum bounded expr
 END
 #<<END
 468
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt
index 626f80c293..7ed53930f4 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,7 +1,7 @@
 #;#;
 #<<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 13:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 13:12 3
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt
index a36af300f9..8355a96418 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,7 +1,7 @@
 #;#;
 #<<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 13:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 13:12 3
 TR opt: multi-file2.rkt 16:10 (+ 3 5) -- fixnum bounded expr
 TR opt: multi-file2.rkt 16:3 (* 3.4 (+ 3 5)) -- binary float
 END
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 fe38573f7a..24968c7274 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,7 @@
 #;#;
 #<<END
-TR missed opt: multiple-irritants.rkt 13:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- all args float-arg-expr, result not Float -- caused by: 13:8 4, 13:24 5
 TR info: multiple-irritants.rkt 13:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- exact real arith
+TR missed opt: multiple-irritants.rkt 13:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- all args float-arg-expr, result not Float -- caused by: 13:8 4, 13:24 5
 END
 #<<END
 120.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/nested-same-kind.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/nested-same-kind.rkt
index 62c84a500c..994ae9b274 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,25 @@
 #;#;
 #<<END
-TR missed opt: nested-same-kind.rkt 37:7 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 37:19 4
-TR info: nested-same-kind.rkt 37:7 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 37:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 37:7 (* 3.0 (ann 4 Integer))
 TR info: nested-same-kind.rkt 37:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 38:14 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 38:26 4
-TR info: nested-same-kind.rkt 38:14 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 38:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 38:14 (* 3.0 (ann 4 Integer))
-TR info: nested-same-kind.rkt 38:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 38:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- all args float-arg-expr, result not Float -- caused by: 38:7 (* 2.0 (* 3.0 (ann 4 Integer)))
+TR info: nested-same-kind.rkt 37:7 (* 3.0 (ann 4 Integer)) -- exact real arith
 TR info: nested-same-kind.rkt 38:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 39:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- all args float-arg-expr, result not Float -- caused by: 39:19 4, 39:35 5
-TR info: nested-same-kind.rkt 39:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 39:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- all args float-arg-expr, result not Float -- caused by: 39:7 (* 3.0 (ann 4 Integer) (ann 5 Integer))
+TR info: nested-same-kind.rkt 38:14 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR info: nested-same-kind.rkt 38:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
 TR info: nested-same-kind.rkt 39:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 40:3 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 40:15 4
-TR info: nested-same-kind.rkt 40:3 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 40:27 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 40:39 4
-TR info: nested-same-kind.rkt 40:27 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 40:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 40:3 (* 3.0 (ann 4 Integer)), 40:27 (* 3.0 (ann 4 Integer))
+TR info: nested-same-kind.rkt 39:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- exact real arith
 TR info: nested-same-kind.rkt 40:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- exact real arith
+TR info: nested-same-kind.rkt 40:27 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR info: nested-same-kind.rkt 40:3 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 37:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 37:7 (* 3.0 (ann 4 Integer))
+TR missed opt: nested-same-kind.rkt 37:7 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 37:19 4
+TR missed opt: nested-same-kind.rkt 38:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- all args float-arg-expr, result not Float -- caused by: 38:7 (* 2.0 (* 3.0 (ann 4 Integer)))
+TR missed opt: nested-same-kind.rkt 38:14 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 38:26 4
+TR missed opt: nested-same-kind.rkt 38:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 38:14 (* 3.0 (ann 4 Integer))
+TR missed opt: nested-same-kind.rkt 39:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- all args float-arg-expr, result not Float -- caused by: 39:7 (* 3.0 (ann 4 Integer) (ann 5 Integer))
+TR missed opt: nested-same-kind.rkt 39:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- all args float-arg-expr, result not Float -- caused by: 39:19 4, 39:35 5
+TR missed opt: nested-same-kind.rkt 40:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 40:3 (* 3.0 (ann 4 Integer)), 40:27 (* 3.0 (ann 4 Integer))
+TR missed opt: nested-same-kind.rkt 40:27 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 40:39 4
+TR missed opt: nested-same-kind.rkt 40:3 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 40:15 4
 END
 #<<END
 24.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/pair.rkt
index 47a7c15602..cef3471557 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,38 @@
 #;#;
 #<<END
 TR missed opt: pair.rkt 61:0 (car (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 61:10 (list 1 2 3)
-TR opt: pair.rkt 62:0 (car (list 1 2 3)) -- pair
 TR missed opt: pair.rkt 63:0 (cdr (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 63:10 (list 1 2 3)
-TR opt: pair.rkt 64:0 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 65:0 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 65:5 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 66:0 (cdr (cdr (cdr (list 1 2 3)))) -- pair
-TR opt: pair.rkt 66:5 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 66:10 (cdr (list 1 2 3)) -- pair
 TR missed opt: pair.rkt 67:16 (cdr (cdr (cdr (cdr (list 1 2 3))))) -- car/cdr on a potentially empty list -- caused by: 67:21 (cdr (cdr (cdr (list 1 2 3))))
-TR opt: pair.rkt 67:21 (cdr (cdr (cdr (list 1 2 3)))) -- pair
-TR opt: pair.rkt 67:26 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 67:31 (cdr (list 1 2 3)) -- pair
 TR missed opt: pair.rkt 70:0 (mcar (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 70:6 (values (ann (mlist 1) (MListof Byte)))
-TR opt: pair.rkt 71:0 (mcar (mlist 1 2 3)) -- pair
 TR missed opt: pair.rkt 72:0 (mcdr (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 72:6 (values (ann (mlist 1) (MListof Byte)))
-TR opt: pair.rkt 73:0 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 74:0 (mcdr (mcdr (mlist 1 2 3))) -- pair
-TR opt: pair.rkt 74:6 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 75:0 (mcdr (mcdr (mcdr (mlist 1 2 3)))) -- pair
-TR opt: pair.rkt 75:6 (mcdr (mcdr (mlist 1 2 3))) -- pair
-TR opt: pair.rkt 75:12 (mcdr (mlist 1 2 3)) -- pair
 TR missed opt: pair.rkt 76:0 (set-mcar! (values (ann (mlist 2) (MListof Byte))) 2) -- car/cdr on a potentially empty list -- caused by: 76:11 (values (ann (mlist 2) (MListof Byte)))
-TR opt: pair.rkt 77:0 (set-mcar! (mlist 2 3 4) 2) -- pair
 TR missed opt: pair.rkt 78:0 (set-mcdr! (values (ann (mlist 2) (MListof Byte))) (values (ann (mlist 2) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 78:11 (values (ann (mlist 2) (MListof Byte)))
-TR opt: pair.rkt 80:0 (mcar (mcons 2 3)) -- pair
-TR opt: pair.rkt 81:0 (mcdr (mcons 2 3)) -- pair
-TR opt: pair.rkt 82:0 (set-mcar! (mcons 2 3) 3) -- pair
-TR opt: pair.rkt 83:0 (set-mcdr! (mcons 2 3) 4) -- pair
 TR missed opt: pair.rkt 84:17 (mcar (quote ())) -- car/cdr on a potentially empty list -- caused by: 84:23 (quote ())
 TR missed opt: pair.rkt 85:17 (mcdr (quote ())) -- car/cdr on a potentially empty list -- caused by: 85:23 (quote ())
 TR missed opt: pair.rkt 86:17 (set-mcar! (quote ()) 2) -- car/cdr on a potentially empty list -- caused by: 86:28 (quote ())
 TR missed opt: pair.rkt 87:17 (set-mcdr! (ann (quote ()) (MListof Integer)) (ann (mlist 3) (MListof Integer))) -- car/cdr on a potentially empty list -- caused by: 87:33 (quote ())
+TR opt: pair.rkt 62:0 (car (list 1 2 3)) -- pair
+TR opt: pair.rkt 64:0 (cdr (list 1 2 3)) -- pair
+TR opt: pair.rkt 65:0 (cdr (cdr (list 1 2 3))) -- pair
+TR opt: pair.rkt 65:5 (cdr (list 1 2 3)) -- pair
+TR opt: pair.rkt 66:0 (cdr (cdr (cdr (list 1 2 3)))) -- pair
+TR opt: pair.rkt 66:10 (cdr (list 1 2 3)) -- pair
+TR opt: pair.rkt 66:5 (cdr (cdr (list 1 2 3))) -- pair
+TR opt: pair.rkt 67:21 (cdr (cdr (cdr (list 1 2 3)))) -- pair
+TR opt: pair.rkt 67:26 (cdr (cdr (list 1 2 3))) -- pair
+TR opt: pair.rkt 67:31 (cdr (list 1 2 3)) -- pair
+TR opt: pair.rkt 71:0 (mcar (mlist 1 2 3)) -- pair
+TR opt: pair.rkt 73:0 (mcdr (mlist 1 2 3)) -- pair
+TR opt: pair.rkt 74:0 (mcdr (mcdr (mlist 1 2 3))) -- pair
+TR opt: pair.rkt 74:6 (mcdr (mlist 1 2 3)) -- pair
+TR opt: pair.rkt 75:0 (mcdr (mcdr (mcdr (mlist 1 2 3)))) -- pair
+TR opt: pair.rkt 75:12 (mcdr (mlist 1 2 3)) -- pair
+TR opt: pair.rkt 75:6 (mcdr (mcdr (mlist 1 2 3))) -- pair
+TR opt: pair.rkt 77:0 (set-mcar! (mlist 2 3 4) 2) -- pair
+TR opt: pair.rkt 80:0 (mcar (mcons 2 3)) -- pair
+TR opt: pair.rkt 81:0 (mcdr (mcons 2 3)) -- pair
+TR opt: pair.rkt 82:0 (set-mcar! (mcons 2 3) 3) -- pair
+TR opt: pair.rkt 83:0 (set-mcdr! (mcons 2 3) 4) -- pair
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/precision-loss.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/precision-loss.rkt
index 640d67bfe3..a6041833ca 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,24 @@
 #;#;
 #<<END
 TR info: precision-loss.rkt 39:3 (* 3/4 2/3) -- exact real arith
+TR info: precision-loss.rkt 43:3 (- 3/4) -- exact real arith
+TR info: precision-loss.rkt 45:39 (+ 1/4 3/4) -- exact real arith
+TR info: precision-loss.rkt 45:39 (+ 1/4 3/4) -- exact real arith
+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
+TR info: precision-loss.rkt 51:3 (* (r 3/4) 2/3) -- exact real arith
+TR info: precision-loss.rkt 52:14 (* 2.0 (* (r 3/4) 2/3)) -- exact real arith
+TR info: precision-loss.rkt 52:21 (* (r 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 missed opt: precision-loss.rkt 43:0 (+ (- 3/4) 2.0) -- exact ops inside float expr -- caused by: 43:3 (- 3/4)
+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 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 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 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 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 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
 2.5
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/real-in-float-expr.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/real-in-float-expr.rkt
index cc5aa6765e..f802464e0f 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,12 @@
 #;#;
 #<<END
-TR missed opt: real-in-float-expr.rkt 23:0 (* (ann 3 Real) 2.3) -- all args float-arg-expr, result not Float -- caused by: 23:8 3
 TR info: real-in-float-expr.rkt 23:0 (* (ann 3 Real) 2.3) -- exact real arith
+TR info: real-in-float-expr.rkt 30:0 (+ 2/3 3/4) -- exact real arith
+TR info: real-in-float-expr.rkt 32:0 (* (ann 2 Natural) 2.0) -- exact real arith
+TR missed opt: real-in-float-expr.rkt 23:0 (* (ann 3 Real) 2.3) -- all args float-arg-expr, result not Float -- caused by: 23:8 3
+TR missed opt: real-in-float-expr.rkt 32:0 (* (ann 2 Natural) 2.0) -- all args float-arg-expr, result not Float -- caused by: 32:8 2
 TR opt: real-in-float-expr.rkt 28:0 (* 2 3) -- fixnum bounded expr
 TR opt: real-in-float-expr.rkt 29:0 (+ 2 3) -- fixnum bounded expr
-TR info: real-in-float-expr.rkt 30:0 (+ 2/3 3/4) -- exact real arith
-TR missed opt: real-in-float-expr.rkt 32:0 (* (ann 2 Natural) 2.0) -- all args float-arg-expr, result not Float -- caused by: 32:8 2
-TR info: real-in-float-expr.rkt 32:0 (* (ann 2 Natural) 2.0) -- exact real arith
 END
 #<<END
 6.8999999999999995
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unary-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unary-float.rkt
index 8c1888dba2..5949baffdd 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,11 @@
 #;#;
 #<<END
-TR missed opt: unary-float.rkt 20:0 (sin (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 20:10 3.4
 TR info: unary-float.rkt 20:0 (sin (ann 3.4 Real)) -- exact real arith
-TR missed opt: unary-float.rkt 21:0 (sin 3) -- all args float-arg-expr, result not Float -- caused by: 21:5 3
 TR info: unary-float.rkt 21:0 (sin 3) -- exact real arith
-TR missed opt: unary-float.rkt 22:0 (abs (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 22:10 3.4
 TR info: unary-float.rkt 22:0 (abs (ann 3.4 Real)) -- exact real arith
+TR missed opt: unary-float.rkt 20:0 (sin (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 20:10 3.4
+TR missed opt: unary-float.rkt 21:0 (sin 3) -- all args float-arg-expr, result not Float -- caused by: 21:5 3
+TR missed opt: unary-float.rkt 22:0 (abs (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 22:10 3.4
 END
 #<<END
 -0.2555411020268312
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unexpected-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/unexpected-complex.rkt
index 65f29cb07b..3586878e2c 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,9 @@
 #;#;
 #<<END
 TR missed opt: unexpected-complex.rkt 18:0 (sqrt (ann 4 Integer)) -- unexpected complex type
-TR opt: unexpected-complex.rkt 19:3 1.2+3.4i -- unboxed literal
-TR opt: unexpected-complex.rkt 19:12 2.0 -- float-arg-expr in complex ops
 TR opt: unexpected-complex.rkt 19:0 (+ 1.2+3.4i 2.0) -- unboxed binary float complex
+TR opt: unexpected-complex.rkt 19:12 2.0 -- float-arg-expr in complex ops
+TR opt: unexpected-complex.rkt 19:3 1.2+3.4i -- unboxed literal
 END
 #<<END
 2
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 bbbe9335e1..9ea5113155 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,7 @@
 #;#;
 #<<END
-TR opt: binary-nonzero-fixnum.rkt 14:8 (vector-length (quote #(1 2 3))) -- known-length vector-length
 TR opt: binary-nonzero-fixnum.rkt 14:0 (modulo (vector-length (quote #(1 2 3))) 2) -- binary nonzero fixnum
+TR opt: binary-nonzero-fixnum.rkt 14:8 (vector-length (quote #(1 2 3))) -- known-length vector-length
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt
index 4c2b396772..646e8a823a 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,19 @@
 #;#;
 #<<END
+TR info: bounds-check.rkt 46:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 48:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 50:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 67:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 69:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 71:1 displayln -- hidden parameter
 TR opt: bounds-check.rkt 34:2 (vector-ref v i) -- vector partial bounds checking elimination
 TR opt: bounds-check.rkt 37:2 (vector-set! v i n) -- vector partial bounds checking elimination
 TR opt: bounds-check.rkt 40:2 (vector-ref v i) -- vector partial bounds checking elimination
 TR opt: bounds-check.rkt 43:2 (vector-set! v i n) -- vector partial bounds checking elimination
-TR info: bounds-check.rkt 46:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 48:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 50:1 displayln -- hidden parameter
 TR opt: bounds-check.rkt 55:2 (flvector-ref v i) -- flvector partial bounds checking elimination
 TR opt: bounds-check.rkt 58:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
 TR opt: bounds-check.rkt 61:2 (flvector-ref v i) -- flvector partial bounds checking elimination
 TR opt: bounds-check.rkt 64:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
-TR info: bounds-check.rkt 67:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 69:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 71:1 displayln -- hidden parameter
 END
 #<<END
 3
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt
index 6ccc8e21a1..d53a2c61f1 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,13 +1,13 @@
 #;#;
 #<<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:15 (- max min) -- exact real arith
 TR info: case-arrow.rkt 42:2 (+ min (/ (* (- max min) x) p)) -- exact real arith
+TR info: case-arrow.rkt 42:9 (/ (* (- max min) x) p) -- 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 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 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 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
 END
 ""
 #lang typed/racket
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt
index 571d243c98..9eff1ab552 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,9 @@
 #;#;
 #<<END
-TR opt: complex-exp.rkt 15:8 0 -- float-arg-expr in complex ops
-TR opt: complex-exp.rkt 15:3 (exp 0) -- unboxed unary float complex
-TR opt: complex-exp.rkt 15:11 1.0+2.0i -- unboxed literal
 TR opt: complex-exp.rkt 15:0 (- (exp 0) 1.0+2.0i) -- unboxed binary float complex
+TR opt: complex-exp.rkt 15:11 1.0+2.0i -- unboxed literal
+TR opt: complex-exp.rkt 15:3 (exp 0) -- unboxed unary float complex
+TR opt: complex-exp.rkt 15:8 0 -- float-arg-expr in complex ops
 END
 #<<END
 0.0-2.0i
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 f9ca0ca638..83232fdaa3 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,11 +1,11 @@
 #;#;
 #<<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 14:13 (+ 2.0 3.0) -- binary float
+TR opt: dead-else.rkt 15:13 (+ 4.0 5.0) -- dead else branch
 TR opt: dead-else.rkt 17:13 (+ 2.0 3.0) -- binary float
+TR opt: dead-else.rkt 18:13 (+ 4.0 5.0) -- dead else branch
 END
 "5.05.0"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt
index 6965a5d194..83db3dea84 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,5 +1,27 @@
 #;#;
 #<<END
+TR info: dead-inf-comp.rkt 159:4 (< rat +inf.f) -- exact real arith
+TR info: dead-inf-comp.rkt 162:4 (< +inf.f rat) -- exact real arith
+TR info: dead-inf-comp.rkt 165:4 (< rat -inf.f) -- exact real arith
+TR info: dead-inf-comp.rkt 168:4 (< -inf.f rat) -- exact real arith
+TR info: dead-inf-comp.rkt 172:4 (> +inf.f rat) -- exact real arith
+TR info: dead-inf-comp.rkt 175:4 (> rat +inf.f) -- exact real arith
+TR info: dead-inf-comp.rkt 178:4 (> -inf.f rat) -- exact real arith
+TR info: dead-inf-comp.rkt 181:4 (> rat -inf.f) -- exact real arith
+TR info: dead-inf-comp.rkt 185:4 (<= rat +inf.f) -- exact real arith
+TR info: dead-inf-comp.rkt 188:4 (<= +inf.f rat) -- exact real arith
+TR info: dead-inf-comp.rkt 191:4 (<= rat -inf.f) -- exact real arith
+TR info: dead-inf-comp.rkt 194:4 (<= -inf.f rat) -- exact real arith
+TR info: dead-inf-comp.rkt 198:4 (>= +inf.f rat) -- exact real arith
+TR info: dead-inf-comp.rkt 201:4 (>= rat +inf.f) -- exact real arith
+TR info: dead-inf-comp.rkt 204:4 (>= -inf.f rat) -- exact real arith
+TR info: dead-inf-comp.rkt 207:4 (>= rat -inf.f) -- exact real arith
+TR info: dead-inf-comp.rkt 212:41 displayln -- hidden parameter
+TR info: dead-inf-comp.rkt 212:41 displayln -- hidden parameter
+TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- dead else branch
+TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- dead else branch
+TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- dead else branch
+TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- in-range
 TR opt: dead-inf-comp.rkt 108:4 (quote dead) -- dead else branch
 TR opt: dead-inf-comp.rkt 110:4 (quote dead) -- dead then branch
 TR opt: dead-inf-comp.rkt 113:4 (quote dead) -- dead then branch
@@ -17,48 +39,26 @@ TR opt: dead-inf-comp.rkt 149:4 (quote dead) -- dead then branch
 TR opt: dead-inf-comp.rkt 152:4 (quote dead) -- dead then branch
 TR opt: dead-inf-comp.rkt 156:4 (quote dead) -- dead else branch
 TR opt: dead-inf-comp.rkt 161:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 159:4 (< rat +inf.f) -- exact real arith
 TR opt: dead-inf-comp.rkt 163:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 162:4 (< +inf.f rat) -- exact real arith
 TR opt: dead-inf-comp.rkt 166:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 165:4 (< rat -inf.f) -- exact real arith
 TR opt: dead-inf-comp.rkt 170:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 168:4 (< -inf.f rat) -- exact real arith
 TR opt: dead-inf-comp.rkt 174:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 172:4 (> +inf.f rat) -- exact real arith
 TR opt: dead-inf-comp.rkt 176:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 175:4 (> rat +inf.f) -- exact real arith
 TR opt: dead-inf-comp.rkt 179:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 178:4 (> -inf.f rat) -- exact real arith
 TR opt: dead-inf-comp.rkt 183:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 181:4 (> rat -inf.f) -- exact real arith
 TR opt: dead-inf-comp.rkt 187:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 185:4 (<= rat +inf.f) -- exact real arith
 TR opt: dead-inf-comp.rkt 189:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 188:4 (<= +inf.f rat) -- exact real arith
 TR opt: dead-inf-comp.rkt 192:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 191:4 (<= rat -inf.f) -- exact real arith
 TR opt: dead-inf-comp.rkt 196:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 194:4 (<= -inf.f rat) -- exact real arith
 TR opt: dead-inf-comp.rkt 200:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 198:4 (>= +inf.f rat) -- exact real arith
 TR opt: dead-inf-comp.rkt 202:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 201:4 (>= rat +inf.f) -- exact real arith
 TR opt: dead-inf-comp.rkt 205:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 204:4 (>= -inf.f rat) -- exact real arith
 TR opt: dead-inf-comp.rkt 209:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 207:4 (>= rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- in-range
-TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 102:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR info: dead-inf-comp.rkt 212:41 displayln -- hidden parameter
 TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
 TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
 TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR info: dead-inf-comp.rkt 212:41 displayln -- hidden parameter
+TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
 TR opt: dead-inf-comp.rkt 212:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
 END
 #<<END
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 1d7d559e18..333cc16f2f 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,9 +1,9 @@
 #;#;
 #<<END
 TR info: dead-then.rkt 13:1 display -- hidden parameter
+TR info: dead-then.rkt 16:1 display -- hidden parameter
 TR opt: dead-then.rkt 14:13 (+ 2.0 3.0) -- dead then branch
 TR opt: dead-then.rkt 15:13 (+ 4.0 5.0) -- binary float
-TR info: dead-then.rkt 16:1 display -- hidden parameter
 TR opt: dead-then.rkt 17:13 (+ 2.0 3.0) -- dead then branch
 TR opt: dead-then.rkt 18:13 (+ 4.0 5.0) -- binary float
 END
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 a4ef846c9e..55167cea52 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,5 +1,29 @@
 #;#;
 #<<END
+TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
 TR opt: derived-pair3.rkt 90:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
 TR opt: derived-pair3.rkt 90:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
 TR opt: derived-pair3.rkt 90:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
@@ -40,30 +64,6 @@ TR opt: derived-pair3.rkt 99:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) --
 TR opt: derived-pair3.rkt 99:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
 TR opt: derived-pair3.rkt 99:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
 TR opt: derived-pair3.rkt 99:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 100:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 101:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 102:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 103:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 104:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 105:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/drop-pure-pred.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/drop-pure-pred.rkt
index 32954b229f..3ccff3373b 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,7 @@
 #;#;
 #<<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
+TR opt: drop-pure-pred.rkt 18:6 (list 2) -- dead else branch
 END
 #<<END
 '(1)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/exact-inexact.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/exact-inexact.rkt
index 0593b80e8f..b24db06415 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,11 +1,11 @@
 #;#;
 #<<END
 TR opt: exact-inexact.rkt 25:0 (exact->inexact (expt 10 100)) -- int to float
-TR opt: exact-inexact.rkt 26:7 (exact->inexact (expt 2.3 3.2)) -- float to float
 TR opt: exact-inexact.rkt 26:0 (round (exact->inexact (expt 2.3 3.2))) -- unary float
+TR opt: exact-inexact.rkt 26:7 (exact->inexact (expt 2.3 3.2)) -- float to float
 TR opt: exact-inexact.rkt 27:0 (real->double-flonum (expt 10 100)) -- int to float
-TR opt: exact-inexact.rkt 28:7 (real->double-flonum (expt 2.3 3.2)) -- float to float
 TR opt: exact-inexact.rkt 28:0 (round (real->double-flonum (expt 2.3 3.2))) -- unary float
+TR opt: exact-inexact.rkt 28:7 (real->double-flonum (expt 2.3 3.2)) -- float to float
 TR opt: exact-inexact.rkt 31:0 (exact->inexact (expt 1.0f0 2.0f0)) -- single-float to single-float
 TR opt: exact-inexact.rkt 32:0 (real->single-flonum (expt 1.0f0 2.0f0)) -- single-float to single-float
 END
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 de44c00a57..6a3a2aec60 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,32 +1,32 @@
 #;#;
 #<<END
-TR opt: fixnum-bounded-expr.rkt 72:2 (+ x (sqr y)) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 78:7 (* y y) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 78:2 (- x (* y y)) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 85:2 (+ x y) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 88:2 (+ x y) -- fixnum bounded expr
 TR missed opt: fixnum-bounded-expr.rkt 91:2 (+ x y) -- out of fixnum range
-TR opt: fixnum-bounded-expr.rkt 93:0 (abs 45) -- fixnum fxabs
-TR opt: fixnum-bounded-expr.rkt 96:0 (fx+ 5 2) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 97:5 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 97:16 (* 24 25) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 97:0 (fx+ (+ 34 231) (* 24 25)) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 98:8 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 98:5 (+ (+ 34 231) 23) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 98:0 (fx+ (+ (+ 34 231) 23) -4) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 99:11 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 99:8 (+ (+ 34 231) 23) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 99:0 (fx+ -4 (+ (+ 34 231) 23)) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 100:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 100:17 (+ 301 302) -- fixnum bounded expr
 TR opt: fixnum-bounded-expr.rkt 100:17 (+ 301 302) -- fixnum bounded expr
 TR opt: fixnum-bounded-expr.rkt 100:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 100:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 102:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 102:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 100:5 (+ 300 301) -- fixnum bounded expr
 TR opt: fixnum-bounded-expr.rkt 102:0 (fx- (+ 300 301) (+ 301 302)) -- fixnum fx-
+TR opt: fixnum-bounded-expr.rkt 102:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 102:5 (+ 300 301) -- fixnum bounded expr
 TR opt: fixnum-bounded-expr.rkt 105:0 (fx* 4 5) -- fixnum fx*
 TR opt: fixnum-bounded-expr.rkt 108:0 (fxquotient (ann 34 Nonnegative-Fixnum) (ann -4 Negative-Fixnum)) -- fixnum fxquotient
 TR opt: fixnum-bounded-expr.rkt 111:0 (fxabs (ann 64235 Nonnegative-Fixnum)) -- fixnum fxabs
+TR opt: fixnum-bounded-expr.rkt 72:2 (+ x (sqr y)) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 78:2 (- x (* y y)) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 78:7 (* y y) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 85:2 (+ x y) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 88:2 (+ x y) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 93:0 (abs 45) -- fixnum fxabs
+TR opt: fixnum-bounded-expr.rkt 96:0 (fx+ 5 2) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 97:0 (fx+ (+ 34 231) (* 24 25)) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 97:16 (* 24 25) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 97:5 (+ 34 231) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 98:0 (fx+ (+ (+ 34 231) 23) -4) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 98:5 (+ (+ 34 231) 23) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 98:8 (+ 34 231) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 99:0 (fx+ -4 (+ (+ 34 231) 23)) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 99:11 (+ 34 231) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 99:8 (+ (+ 34 231) 23) -- fixnum bounded expr
 END
 #<<END
 28
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-comparison.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-comparison.rkt
index 394aaf6a88..cf7b011a2a 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,8 @@
 #;#;
 #<<END
-TR opt: fixnum-comparison.rkt 15:3 (vector-length (quote #(1 2 3))) -- known-length vector-length
-TR opt: fixnum-comparison.rkt 15:29 (string-length "asdf") -- string-length
 TR opt: fixnum-comparison.rkt 15:0 (< (vector-length (quote #(1 2 3))) (string-length "asdf")) -- binary fixnum comp
+TR opt: fixnum-comparison.rkt 15:29 (string-length "asdf") -- string-length
+TR opt: fixnum-comparison.rkt 15:3 (vector-length (quote #(1 2 3))) -- known-length vector-length
 END
 #<<END
 #t
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate-top.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate-top.rkt
index 74fef19267..989a6fa497 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,9 @@
 #;#;
 #<<END
+TR opt: float-complex-conjugate-top.rkt 16:0 (conjugate (+ 1.0+2.0i 2.0+4.0i)) -- unboxed unary float complex
+TR opt: float-complex-conjugate-top.rkt 16:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 TR opt: float-complex-conjugate-top.rkt 16:14 1.0+2.0i -- unboxed literal
 TR opt: float-complex-conjugate-top.rkt 16:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-conjugate-top.rkt 16:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-conjugate-top.rkt 16:0 (conjugate (+ 1.0+2.0i 2.0+4.0i)) -- unboxed unary float complex
 END
 #<<END
 3.0-6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-conjugate.rkt
index ae081f53fe..5d39541d81 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,10 @@
 #;#;
 #<<END
+TR opt: float-complex-conjugate.rkt 17:0 (+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i)) -- unboxed binary float complex
 TR opt: float-complex-conjugate.rkt 17:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-conjugate.rkt 17:24 (conjugate 2.0+4.0i) -- unboxed unary float complex
 TR opt: float-complex-conjugate.rkt 17:3 (conjugate 1.0+2.0i) -- unboxed unary float complex
 TR opt: float-complex-conjugate.rkt 17:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-conjugate.rkt 17:24 (conjugate 2.0+4.0i) -- unboxed unary float complex
-TR opt: float-complex-conjugate.rkt 17:0 (+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i)) -- unboxed binary float complex
 END
 #<<END
 3.0-6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-div.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-div.rkt
index e65503a75f..778d3ce78e 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,9 @@
 #;#;
 #<<END
-TR opt: float-complex-div.rkt 16:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-div.rkt 16:0 (/ 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-div.rkt 16:12 2.0+4.0i -- unboxed literal
 TR opt: float-complex-div.rkt 16:21 3.0+6.0i -- unboxed literal
-TR opt: float-complex-div.rkt 16:0 (/ 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-div.rkt 16:3 1.0+2.0i -- unboxed literal
 END
 #<<END
 0.03333333333333333-0.06666666666666667i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-fixnum.rkt
index 2aafdd6bd3..47548516f9 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,12 @@
 #;#;
 #<<END
+TR opt: float-complex-fixnum.rkt 19:0 (+ (modulo 2 1) 1.0+2.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-fixnum.rkt 19:16 1.0+2.0i -- unboxed literal
+TR opt: float-complex-fixnum.rkt 19:25 3.0+6.0i -- unboxed literal
 TR opt: float-complex-fixnum.rkt 19:3 (modulo 2 1) -- binary nonzero fixnum
 TR opt: float-complex-fixnum.rkt 19:3 (modulo 2 1) -- binary nonzero fixnum
 TR opt: float-complex-fixnum.rkt 19:3 (modulo 2 1) -- binary nonzero fixnum
 TR opt: float-complex-fixnum.rkt 19:3 (modulo 2 1) -- float-arg-expr in complex ops
-TR opt: float-complex-fixnum.rkt 19:16 1.0+2.0i -- unboxed literal
-TR opt: float-complex-fixnum.rkt 19:25 3.0+6.0i -- unboxed literal
-TR opt: float-complex-fixnum.rkt 19:0 (+ (modulo 2 1) 1.0+2.0i 3.0+6.0i) -- unboxed binary float complex
 END
 #<<END
 4.0+8.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-div.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-div.rkt
index 278d175051..329bff8653 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,35 @@
 #;#;
 #<<END
-TR opt: float-complex-float-div.rkt 43:62 x -- unbox float-complex
 TR opt: float-complex-float-div.rkt 43:51 (real-part x) -- complex accessor elimination
-TR opt: float-complex-float-div.rkt 44:62 x -- unbox float-complex
+TR opt: float-complex-float-div.rkt 43:62 x -- unbox float-complex
 TR opt: float-complex-float-div.rkt 44:51 (imag-part x) -- complex accessor elimination
-TR opt: float-complex-float-div.rkt 46:9 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 44:62 x -- unbox float-complex
 TR opt: float-complex-float-div.rkt 46:13 2.0+4.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 46:6 (/ 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 47:9 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 46:9 1.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-div.rkt 47:18 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-div.rkt 47:6 (/ 1.0+2.0i 2.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 48:9 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 47:9 1.0+2.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 48:13 2.0+4.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 48:22 3.0+6.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 48:6 (/ 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 49:9 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 48:9 1.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-div.rkt 49:18 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-div.rkt 49:22 3.0+6.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 49:6 (/ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 50:9 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 49:9 1.0+2.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 50:18 2.0+4.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 50:27 3.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-div.rkt 50:6 (/ 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 51:9 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 50:9 1.0+2.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 51:18 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-div.rkt 51:22 3.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-div.rkt 51:6 (/ 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 52:9 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 51:9 1.0+2.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 52:13 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-div.rkt 52:17 3.0+6.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 52:6 (/ 1.0 2.0 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 52:9 1.0 -- float-arg-expr in complex ops
 END
 #<<END
 '("0.1000000000-0.2000000000" "0.50000000001.0000000000" "-0.0200000000-0.0266666667" "0.16666666670.0000000000" "0.16666666670.0000000000" "0.16666666670.3333333333" "0.0333333333-0.0666666667")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-mul.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-mul.rkt
index 234d8b9892..7eb093122e 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,27 @@
 #;#;
 #<<END
+TR opt: float-complex-float-mul.rkt 39:0 (* 1.0 2.0+4.0i) -- unboxed binary float complex
 TR opt: float-complex-float-mul.rkt 39:3 1.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-mul.rkt 39:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 39:0 (* 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 40:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 40:12 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-mul.rkt 40:0 (* 1.0+2.0i 2.0) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 40:12 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 40:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 41:0 (* 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 41:16 3.0+6.0i -- unboxed literal
 TR opt: float-complex-float-mul.rkt 41:3 1.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-mul.rkt 41:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 41:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 41:0 (* 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 42:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 42:0 (* 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-float-mul.rkt 42:12 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-mul.rkt 42:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 42:0 (* 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 43:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 42:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 43:0 (* 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
 TR opt: float-complex-float-mul.rkt 43:12 2.0+4.0i -- unboxed literal
 TR opt: float-complex-float-mul.rkt 43:21 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 43:0 (* 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 44:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 43:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 44:0 (* 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
 TR opt: float-complex-float-mul.rkt 44:12 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-mul.rkt 44:16 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 44:0 (* 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 44:3 1.0+2.0i -- unboxed literal
 END
 #<<END
 2.0+4.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-small.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float-small.rkt
index 1b24658807..b0ed3e3dbc 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,23 @@
 #;#;
 #<<END
-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 34:12 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 34:3 1.0+2.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 35:3 1.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-small.rkt 35:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 35:0 (+ 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 36:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 36:12 3.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-small.rkt 36:0 (- 1.0+2.0i 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-small.rkt 36:12 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 36:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 37:0 (- 1.0 2.0+4.0i) -- unboxed binary float complex
 TR opt: float-complex-float-small.rkt 37:3 1.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float-small.rkt 37:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 37:0 (- 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 38:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 38:15 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 38:19 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 38:0 (+ 1.0+2.0i (+ 1.0 2.0)) -- unboxed binary float complex
 TR opt: float-complex-float-small.rkt 38:12 (+ 1.0 2.0) -- binary float
 TR opt: float-complex-float-small.rkt 38:12 (+ 1.0 2.0) -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 38:0 (+ 1.0+2.0i (+ 1.0 2.0)) -- unboxed binary float complex
+TR opt: float-complex-float-small.rkt 38:15 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 38:19 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 38:3 1.0+2.0i -- unboxed literal
 END
 #<<END
 4.0+2.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-float.rkt
index a7f0b65fb7..c0070b773b 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,21 @@
 #;#;
 #<<END
-TR opt: float-complex-float.rkt 31:3 1.0+2.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 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 31:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float.rkt 32:0 (- 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float.rkt 32:16 3.0+6.0i -- unboxed literal
 TR opt: float-complex-float.rkt 32:3 1.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float.rkt 32:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float.rkt 32:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 32:0 (- 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 33:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float.rkt 33:0 (- 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-float.rkt 33:12 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float.rkt 33:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 33:0 (- 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 34:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float.rkt 33:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float.rkt 34:0 (- 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
 TR opt: float-complex-float.rkt 34:12 2.0+4.0i -- unboxed literal
 TR opt: float-complex-float.rkt 34:21 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float.rkt 34:0 (- 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
+TR opt: float-complex-float.rkt 34:3 1.0+2.0i -- unboxed literal
 END
 #<<END
 6.0+8.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-i.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-i.rkt
index d8f81930fa..8c39a314cc 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,10 @@
 #;#;
 #<<END
-TR opt: float-complex-i.rkt 17:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-i.rkt 17:0 (+ 1.0+2.0i (* 0+1.0i 2.0+4.0i)) -- unboxed binary float complex
+TR opt: float-complex-i.rkt 17:12 (* 0+1.0i 2.0+4.0i) -- unboxed binary float complex
 TR opt: float-complex-i.rkt 17:15 0+1.0i -- unboxed literal
 TR opt: float-complex-i.rkt 17:21 2.0+4.0i -- unboxed literal
-TR opt: float-complex-i.rkt 17:12 (* 0+1.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-i.rkt 17:0 (+ 1.0+2.0i (* 0+1.0i 2.0+4.0i)) -- unboxed binary float complex
+TR opt: float-complex-i.rkt 17:3 1.0+2.0i -- unboxed literal
 END
 #<<END
 -3.0+4.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-integer.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-integer.rkt
index c9dbb84934..15b06b329d 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,8 @@
 #;#;
 #<<END
-TR opt: float-complex-integer.rkt 15:3 (expt 2 100) -- float-arg-expr in complex ops
-TR opt: float-complex-integer.rkt 15:16 1.0+2.0i -- unboxed literal
 TR opt: float-complex-integer.rkt 15:0 (+ (expt 2 100) 1.0+2.0i) -- unboxed binary float complex
+TR opt: float-complex-integer.rkt 15:16 1.0+2.0i -- unboxed literal
+TR opt: float-complex-integer.rkt 15:3 (expt 2 100) -- float-arg-expr in complex ops
 END
 #<<END
 1.2676506002282294e+30+2.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-mult.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-mult.rkt
index c01caccabf..db3276769e 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,9 @@
 #;#;
 #<<END
-TR opt: float-complex-mult.rkt 16:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-mult.rkt 16:0 (* 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-mult.rkt 16:12 2.0+4.0i -- unboxed literal
 TR opt: float-complex-mult.rkt 16:21 3.0+6.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 16:0 (* 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-mult.rkt 16:3 1.0+2.0i -- unboxed literal
 END
 #<<END
 -66.0-12.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts.rkt
index d49727c4f8..52b21bf3e5 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,11 @@
 #;#;
 #<<END
-TR opt: float-complex-parts.rkt 20:11 1.0+2.0i -- unboxed literal
 TR opt: float-complex-parts.rkt 20:0 (real-part 1.0+2.0i) -- complex accessor elimination
-TR opt: float-complex-parts.rkt 21:11 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts.rkt 20:11 1.0+2.0i -- unboxed literal
 TR opt: float-complex-parts.rkt 21:0 (imag-part 1.0+2.0i) -- complex accessor elimination
-TR opt: float-complex-parts.rkt 22:11 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts.rkt 21:11 1.0+2.0i -- unboxed literal
 TR opt: float-complex-parts.rkt 22:0 (real-part 1.0+2.0i) -- complex accessor elimination
+TR opt: float-complex-parts.rkt 22:11 1.0+2.0i -- unboxed literal
 END
 #<<END
 1.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts2.rkt
index c5ba27c354..f8aede2bbc 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,33 @@
 #;#;
 #<<END
-TR opt: float-complex-parts2.rkt 45:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 45:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 45:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 45:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 45:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 45:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 TR opt: float-complex-parts2.rkt 45:0 (real-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 46:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 46:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 46:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 46:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 46:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 46:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 45:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+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: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:23 2.0+4.0i -- unboxed literal
 TR opt: float-complex-parts2.rkt 46:0 (unsafe-flreal-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 47:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 47:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 47:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 47:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 47:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 47:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 46:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+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: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:32 2.0+4.0i -- unboxed literal
 TR opt: float-complex-parts2.rkt 47:0 (imag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 48:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 48:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 48:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 48:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 48:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 48:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 47:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 47:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 47:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 47:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 47:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 47:23 2.0+4.0i -- unboxed literal
 TR opt: float-complex-parts2.rkt 48:0 (unsafe-flimag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
+TR opt: float-complex-parts2.rkt 48:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 48:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 48:23 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 48:23 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 48:32 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 48:32 2.0+4.0i -- unboxed literal
 END
 #<<END
 3.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-parts3.rkt
index dfa8be669d..15b5a50c10 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,29 @@
 #;#;
 #<<END
-TR opt: float-complex-parts3.rkt 41:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 41:26 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 41:35 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 41:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 41:12 (real-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
 TR opt: float-complex-parts3.rkt 41:0 (+ 1.0+2.0i (real-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 41:12 (real-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
+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:26 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 41:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 41:35 3.0+6.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 42:0 (+ 1.0+2.0i (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 42:12 (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
 TR opt: float-complex-parts3.rkt 42:3 1.0+2.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:35 2.0+4.0i -- unboxed literal
 TR opt: float-complex-parts3.rkt 42:44 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 42:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 42:12 (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 42:0 (+ 1.0+2.0i (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 43:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 43:26 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 43:35 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 43:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 43:12 (imag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
 TR opt: float-complex-parts3.rkt 43:0 (+ 1.0+2.0i (imag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 43:12 (imag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
+TR opt: float-complex-parts3.rkt 43:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 43:26 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 43:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 43:35 3.0+6.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 44:0 (+ 1.0+2.0i (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 44:12 (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
 TR opt: float-complex-parts3.rkt 44:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 44:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-parts3.rkt 44:35 2.0+4.0i -- unboxed literal
 TR opt: float-complex-parts3.rkt 44:44 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 44:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 44:12 (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 44:0 (+ 1.0+2.0i (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
 END
 #<<END
 6.0+2.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-sin.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex-sin.rkt
index da9f8ea856..b7b58c9972 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,16 @@
 #;#;
 #<<END
-TR missed opt: float-complex-sin.rkt 25:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 25:21 t
+TR info: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- exact real arith
+TR info: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- exact real arith
+TR info: float-complex-sin.rkt 25:18 (* t 6.28) -- exact real arith
 TR info: float-complex-sin.rkt 25:18 (* t 6.28) -- exact real arith
 TR missed opt: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 25:18 (* t 6.28)
-TR info: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- exact real arith
-TR missed opt: float-complex-sin.rkt 25:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 25:21 t
-TR info: float-complex-sin.rkt 25:18 (* t 6.28) -- exact real arith
 TR missed opt: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 25:18 (* t 6.28)
-TR info: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- exact real arith
+TR missed opt: float-complex-sin.rkt 25:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 25:21 t
+TR missed opt: float-complex-sin.rkt 25:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 25:21 t
+TR opt: float-complex-sin.rkt 25:10 (+ (sin (* t 6.28)) 0.0+0.0i) -- unboxed binary float complex
 TR opt: float-complex-sin.rkt 25:13 (sin (* t 6.28)) -- float-arg-expr in complex ops
 TR opt: float-complex-sin.rkt 25:30 0.0+0.0i -- unboxed literal
-TR opt: float-complex-sin.rkt 25:10 (+ (sin (* t 6.28)) 0.0+0.0i) -- unboxed binary float complex
 END
 #<<END
 -0.0031853017931379904+0.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt
index 10e2e67476..565f5899e7 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,11 @@
 #;#;
 #<<END
-TR opt: float-complex.rkt 19:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex.rkt 19:12 2.0+4.0i -- unboxed literal
 TR opt: float-complex.rkt 19:0 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex.rkt 20:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex.rkt 20:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex.rkt 19:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex.rkt 19:3 1.0+2.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 20:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex.rkt 20:3 1.0+2.0i -- unboxed literal
 END
 #<<END
 3.0+6.0i
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 f783285d62..def2317f9a 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,8 +1,8 @@
 #;#;
 #<<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 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 18:0 (+ (expt 100 100) 2.0) -- binary float
 END
 #<<END
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 a5f54dc0ab..0bb77bff6c 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,13 @@
 #;#;
 #<<END
-TR opt: float-real.rkt 21:0 (+ 2.3 (ann 3 Positive-Real)) -- binary float
-TR missed opt: float-real.rkt 22:15 (* (ann 2 Integer) 3.2) -- all args float-arg-expr, result not Float -- caused by: 22:23 2
 TR info: float-real.rkt 22:15 (* (ann 2 Integer) 3.2) -- exact real arith
-TR opt: float-real.rkt 22:0 (+ 2.3 (assert (* (ann 2 Integer) 3.2) positive?)) -- binary float
-TR missed opt: float-real.rkt 23:7 (* (ann 2 Integer) 3.1) -- all args float-arg-expr, result not Float -- caused by: 23:15 2
-TR info: float-real.rkt 23:7 (* (ann 2 Integer) 3.1) -- exact real arith
-TR missed opt: float-real.rkt 23:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- all args float-arg-expr, result not Float -- caused by: 23:7 (* (ann 2 Integer) 3.1)
 TR info: float-real.rkt 23:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- exact real arith
+TR info: float-real.rkt 23:7 (* (ann 2 Integer) 3.1) -- exact real arith
+TR missed opt: float-real.rkt 22:15 (* (ann 2 Integer) 3.2) -- all args float-arg-expr, result not Float -- caused by: 22:23 2
+TR missed opt: float-real.rkt 23:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- all args float-arg-expr, result not Float -- caused by: 23:7 (* (ann 2 Integer) 3.1)
+TR missed opt: float-real.rkt 23:7 (* (ann 2 Integer) 3.1) -- all args float-arg-expr, result not Float -- caused by: 23:15 2
+TR opt: float-real.rkt 21:0 (+ 2.3 (ann 3 Positive-Real)) -- binary float
+TR opt: float-real.rkt 22:0 (+ 2.3 (assert (* (ann 2 Integer) 3.2) positive?)) -- binary float
 END
 #<<END
 5.3
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 336756f456..d50ea0d644 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,8 +1,8 @@
 #;#;
 #<<END
+TR info: in-bytes.rkt 11:7 display -- hidden parameter
+TR info: in-bytes.rkt 11:7 display -- hidden parameter
 TR opt: in-bytes.rkt 8:0 #%module-begin -- in-bytes
-TR info: in-bytes.rkt 11:7 display -- hidden parameter
-TR info: in-bytes.rkt 11:7 display -- hidden parameter
 END
 "495051"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt
index 8e8aff901c..62a0b3a5a6 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,8 +1,8 @@
 #;#;
 #<<END
+TR info: in-list.rkt 11:7 display -- hidden parameter
+TR info: in-list.rkt 11:7 display -- hidden parameter
 TR opt: in-list.rkt 8:0 #%module-begin -- in-list
-TR info: in-list.rkt 11:7 display -- hidden parameter
-TR info: in-list.rkt 11:7 display -- hidden parameter
 END
 "123"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt
index 7f4e7cca72..d37360ca07 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,8 +1,8 @@
 #;#;
 #<<END
+TR info: in-range.rkt 11:3 display -- hidden parameter
+TR info: in-range.rkt 11:3 display -- hidden parameter
 TR opt: in-range.rkt 8:0 #%module-begin -- in-range
-TR info: in-range.rkt 11:3 display -- hidden parameter
-TR info: in-range.rkt 11:3 display -- hidden parameter
 END
 "0123"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt
index 5e0fb097d0..2f8f18f15a 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,8 +1,8 @@
 #;#;
 #<<END
+TR info: in-string.rkt 11:7 display -- hidden parameter
+TR info: in-string.rkt 11:7 display -- hidden parameter
 TR opt: in-string.rkt 8:0 #%module-begin -- in-string
-TR info: in-string.rkt 11:7 display -- hidden parameter
-TR info: in-string.rkt 11:7 display -- hidden parameter
 END
 "123"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt
index 6789725fd7..6c3e35b3be 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,8 +1,8 @@
 #;#;
 #<<END
+TR info: in-vector.rkt 11:7 display -- hidden parameter
+TR info: in-vector.rkt 11:7 display -- hidden parameter
 TR opt: in-vector.rkt 8:0 #%module-begin -- in-vector
-TR info: in-vector.rkt 11:7 display -- hidden parameter
-TR info: in-vector.rkt 11:7 display -- hidden parameter
 END
 "123"
 #lang typed/scheme
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-promotion.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-promotion.rkt
index 5fc784f10e..596d65944b 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,9 @@
 #;#;
 #<<END
-TR missed opt: invalid-float-promotion.rkt 16:0 (/ (ann 1 Integer) 2.0) -- all args float-arg-expr, result not Float -- caused by: 16:8 1
 TR info: invalid-float-promotion.rkt 16:0 (/ (ann 1 Integer) 2.0) -- exact real arith
-TR missed opt: invalid-float-promotion.rkt 17:0 (* (ann 2/3 Exact-Rational) 3.0) -- all args float-arg-expr, result not Float -- caused by: 17:8 2/3
 TR info: invalid-float-promotion.rkt 17:0 (* (ann 2/3 Exact-Rational) 3.0) -- exact real arith
+TR missed opt: invalid-float-promotion.rkt 16:0 (/ (ann 1 Integer) 2.0) -- all args float-arg-expr, result not Float -- caused by: 16:8 1
+TR missed opt: invalid-float-promotion.rkt 17:0 (* (ann 2/3 Exact-Rational) 3.0) -- all args float-arg-expr, result not Float -- caused by: 17:8 2/3
 END
 #<<END
 0.5
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 ab811d8125..2b17fd11dc 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,28 +1,28 @@
 #;#;
 #<<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 info: invalid-unboxed-let.rkt 37:3 display -- hidden parameter
 TR info: invalid-unboxed-let.rkt 38:3 display -- hidden parameter
 TR info: invalid-unboxed-let.rkt 39:3 display -- hidden parameter
+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 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 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 33:10 (+ 3.0+6.0i 4.0+8.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 36:11 (+ t1 t1) -- unboxed binary float complex
+TR opt: invalid-unboxed-let.rkt 36:11 (+ t1 t1) -- unboxed binary float complex
+TR opt: invalid-unboxed-let.rkt 36:11 (+ t1 t1) -- unboxed binary 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 -- leave var unboxed
+TR opt: invalid-unboxed-let.rkt 36:14 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:14 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:14 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:17 t1 -- leave var unboxed
+TR opt: invalid-unboxed-let.rkt 36:17 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:17 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let.rkt 36:17 t1 -- unbox float-complex
 END
 "6.0+12.0i7.0+14.0i1.0+2.0i1"
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt
index e38fe56589..6405b23a56 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,14 @@
 #;#;
 #<<END
+TR opt: invalid-unboxed-let2.rkt 24:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 TR opt: invalid-unboxed-let2.rkt 24:33 1.0+2.0i -- unboxed literal
 TR opt: invalid-unboxed-let2.rkt 24:42 2.0+4.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 24:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: invalid-unboxed-let2.rkt 24:52 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
 TR opt: invalid-unboxed-let2.rkt 24:55 3.0+6.0i -- unboxed literal
 TR opt: invalid-unboxed-let2.rkt 24:64 4.0+8.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 24:52 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
+TR opt: invalid-unboxed-let2.rkt 25:2 (+ t1 t2) -- unboxed binary float complex
 TR opt: invalid-unboxed-let2.rkt 25:5 t1 -- unbox float-complex
 TR opt: invalid-unboxed-let2.rkt 25:8 t2 -- unbox float-complex
-TR opt: invalid-unboxed-let2.rkt 25:2 (+ t1 t2) -- unboxed binary float complex
 END
 #<<END
 10.0+20.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-vector-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-vector-length.rkt
index 053a5712f0..8c10a4cb00 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,7 @@
 #;#;
 #<<END
-TR opt: known-vector-length.rkt 14:5 (vector-length (ann (vector 1 2) (Vector Integer Integer))) -- known-length vector-length
 TR opt: known-vector-length.rkt 14:0 (+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer)))) -- fixnum bounded expr
+TR opt: known-vector-length.rkt 14:5 (vector-length (ann (vector 1 2) (Vector Integer Integer))) -- known-length vector-length
 END
 #<<END
 4
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 7e96554019..36cdbbe842 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,10 +1,10 @@
 #;#;
 #<<END
+TR missed opt: list.rkt 33:0 (rest (rest l)) -- car/cdr on a potentially empty list -- caused by: 33:6 (rest l)
 TR opt: list.rkt 30:0 (first l) -- pair
 TR opt: list.rkt 31:0 (rest l) -- pair
 TR opt: list.rkt 32:0 (second l) -- pair
 TR opt: list.rkt 32:0 (second l) -- pair
-TR missed opt: list.rkt 33:0 (rest (rest l)) -- car/cdr on a potentially empty list -- caused by: 33:6 (rest l)
 TR opt: list.rkt 33:6 (rest l) -- pair
 TR opt: list.rkt 34:0 (third l) -- pair
 TR opt: list.rkt 34:0 (third l) -- pair
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 fee9e12e27..39501b1986 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,7 @@
 #;#;
 #<<END
-TR opt: magnitude.rkt 16:11 3.0+4.0i -- unboxed literal
 TR opt: magnitude.rkt 16:0 (magnitude 3.0+4.0i) -- unboxed unary float complex
+TR opt: magnitude.rkt 16:11 3.0+4.0i -- unboxed literal
 END
 #<<END
 5.0
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 2b3c8b4ead..add0aa7a32 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,19 @@
 #;#;
 #<<END
-TR opt: make-polar.rkt 30:6 (make-polar 1.0 1.0) -- make-rectangular elimination
 TR opt: make-polar.rkt 30:6 (make-polar 1.0 1.0) -- make-polar
-TR opt: make-polar.rkt 34:50 p -- unbox float-complex
-TR opt: make-polar.rkt 34:39 (real-part p) -- unboxed unary float complex
+TR opt: make-polar.rkt 30:6 (make-polar 1.0 1.0) -- make-rectangular elimination
+TR opt: make-polar.rkt 33:0 (let ((p (+ 1.0+2.0i (make-polar 2.0 4.0)))) (string-append (real->decimal-string (real-part p) 3) (real->decimal-string (imag-part p) 3))) -- unboxed let bindings
 TR opt: make-polar.rkt 33:12 1.0+2.0i -- unboxed literal
 TR opt: make-polar.rkt 33:21 (make-polar 2.0 4.0) -- make-rectangular elimination
 TR opt: make-polar.rkt 33:9 (+ 1.0+2.0i (make-polar 2.0 4.0)) -- unboxed binary float complex
-TR opt: make-polar.rkt 33:0 (let ((p (+ 1.0+2.0i (make-polar 2.0 4.0)))) (string-append (real->decimal-string (real-part p) 3) (real->decimal-string (imag-part p) 3))) -- unboxed let bindings
-TR opt: make-polar.rkt 34:50 p -- unboxed complex variable
-TR opt: make-polar.rkt 34:50 p -- leave var unboxed
 TR opt: make-polar.rkt 34:39 (real-part p) -- complex accessor elimination
-TR opt: make-polar.rkt 35:50 p -- unboxed complex variable
-TR opt: make-polar.rkt 35:50 p -- leave var unboxed
+TR opt: make-polar.rkt 34:39 (real-part p) -- unboxed unary float complex
+TR opt: make-polar.rkt 34:50 p -- leave var unboxed
+TR opt: make-polar.rkt 34:50 p -- unbox float-complex
+TR opt: make-polar.rkt 34:50 p -- unboxed complex variable
 TR opt: make-polar.rkt 35:39 (imag-part p) -- complex accessor elimination
+TR opt: make-polar.rkt 35:50 p -- leave var unboxed
+TR opt: make-polar.rkt 35:50 p -- unboxed complex variable
 END
 #<<END
 "-0.3070.486"
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/maybe-exact-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/maybe-exact-complex.rkt
index 8a3c5e4d01..cfc6600ea4 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,8 @@
 #;#;
 #<<END
-TR opt: maybe-exact-complex.rkt 17:3 1.0+2.0i -- unboxed literal
-TR opt: maybe-exact-complex.rkt 17:12 2+4i -- unboxed literal
 TR opt: maybe-exact-complex.rkt 17:0 (+ 1.0+2.0i 2+4i) -- unboxed binary float complex
+TR opt: maybe-exact-complex.rkt 17:12 2+4i -- unboxed literal
+TR opt: maybe-exact-complex.rkt 17:3 1.0+2.0i -- unboxed literal
 END
 #<<END
 3.0+6.0i
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 b7fef76669..4d2c354875 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
@@ -2,10 +2,10 @@
 #<<END
 TR opt: multi-flcomp.rkt 21:0 (<= 1.0 2.0 3.0) -- multi float comp
 TR opt: multi-flcomp.rkt 23:0 (<= 1.0 2.0 3.0 4.0) -- multi float comp
-TR opt: multi-flcomp.rkt 24:16 (+ 2.0 2.0) -- binary float
 TR opt: multi-flcomp.rkt 24:0 (<= 1.0 2.0 3.0 (+ 2.0 2.0)) -- multi float comp
-TR opt: multi-flcomp.rkt 25:12 (+ 2.0 2.0) -- binary float
+TR opt: multi-flcomp.rkt 24:16 (+ 2.0 2.0) -- binary float
 TR opt: multi-flcomp.rkt 25:0 (<= 1.0 2.0 (+ 2.0 2.0) 3.0) -- multi float comp
+TR opt: multi-flcomp.rkt 25:12 (+ 2.0 2.0) -- binary float
 END
 #<<END
 #t
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float-complex.rkt
index 74b62ac3ff..3d0e51b993 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,10 @@
 #;#;
 #<<END
-TR opt: n-ary-float-complex.rkt 17:3 1.0+2.0i -- unboxed literal
+TR opt: n-ary-float-complex.rkt 17:0 (+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
 TR opt: n-ary-float-complex.rkt 17:12 2.0+4.0i -- unboxed literal
 TR opt: n-ary-float-complex.rkt 17:21 3.0+6.0i -- unboxed literal
+TR opt: n-ary-float-complex.rkt 17:3 1.0+2.0i -- unboxed literal
 TR opt: n-ary-float-complex.rkt 17:30 4.0+8.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 17:0 (+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
 END
 #<<END
 10.0+20.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float-complex.rkt
index d361e347fe..60c589b3eb 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,10 @@
 #;#;
 #<<END
-TR opt: nested-float-complex.rkt 17:3 1.0+2.0i -- unboxed literal
+TR opt: nested-float-complex.rkt 17:0 (+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i)) -- unboxed binary float complex
+TR opt: nested-float-complex.rkt 17:12 (- 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 TR opt: nested-float-complex.rkt 17:15 2.0+4.0i -- unboxed literal
 TR opt: nested-float-complex.rkt 17:24 3.0+6.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 17:12 (- 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: nested-float-complex.rkt 17:0 (+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i)) -- unboxed binary float complex
+TR opt: nested-float-complex.rkt 17:3 1.0+2.0i -- unboxed literal
 END
 #<<END
 0.0+0.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float.rkt
index 51e3395a30..5e83879e08 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,7 @@
 #;#;
 #<<END
-TR opt: nested-float.rkt 14:7 (+ 3.0 4.0) -- binary float
 TR opt: nested-float.rkt 14:0 (+ 2.0 (+ 3.0 4.0)) -- binary float
+TR opt: nested-float.rkt 14:7 (+ 3.0 4.0) -- binary float
 END
 #<<END
 9.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-float2.rkt
index 6c4cc471fa..03add3c997 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,7 @@
 #;#;
 #<<END
-TR opt: nested-float2.rkt 14:7 (* 3.0 4.0) -- binary float
 TR opt: nested-float2.rkt 14:0 (+ 2.0 (* 3.0 4.0)) -- binary float
+TR opt: nested-float2.rkt 14:7 (* 3.0 4.0) -- binary float
 END
 #<<END
 14.0
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-let-loop.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-let-loop.rkt
index 9106f46ce1..c98109f05b 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,37 @@
 #;#;
 #<<END
-TR opt: nested-let-loop.rkt 53:38 r -- unbox float-complex
-TR opt: nested-let-loop.rkt 53:40 s -- unbox float-complex
-TR opt: nested-let-loop.rkt 53:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 46:8 r -- unboxed var -> table
+TR opt: nested-let-loop.rkt 44:0 (let: loop1 : Float-Complex ((x : (Listof Float-Complex) (quote (1.0+2.0i 2.0+4.0i))) (r : Float-Complex 0.0+0.0i)) (if (null? x) r (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))))) -- unboxed call site
 TR opt: nested-let-loop.rkt 44:6 loop1 -- fun -> unboxed fun
+TR opt: nested-let-loop.rkt 44:6 loop1 -- unboxed let loop
+TR opt: nested-let-loop.rkt 46:28 0.0+0.0i -- unboxed literal
+TR opt: nested-let-loop.rkt 46:8 r -- unboxed var -> table
 TR opt: nested-let-loop.rkt 48:10 r -- unboxed complex variable
-TR opt: nested-let-loop.rkt 53:38 r -- leave var unboxed
-TR opt: nested-let-loop.rkt 53:40 s -- unbox float-complex
-TR opt: nested-let-loop.rkt 53:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 51:18 s -- unboxed var -> table
+TR opt: nested-let-loop.rkt 49:10 (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))) -- unboxed call site
 TR opt: nested-let-loop.rkt 49:16 loop2 -- fun -> unboxed fun
-TR opt: nested-let-loop.rkt 53:38 r -- leave var unboxed
-TR opt: nested-let-loop.rkt 53:40 s -- leave var unboxed
-TR opt: nested-let-loop.rkt 53:35 (+ r s) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 49:16 loop2 -- unboxed let loop
+TR opt: nested-let-loop.rkt 51:18 s -- unboxed var -> table
+TR opt: nested-let-loop.rkt 51:38 0.0+0.0i -- unboxed literal
+TR opt: nested-let-loop.rkt 53:20 (loop1 (cdr x) (+ r s)) -- call to fun with unboxed args
 TR opt: nested-let-loop.rkt 53:20 (loop1 (cdr x) (+ r s)) -- unboxed call site
 TR opt: nested-let-loop.rkt 53:27 (cdr x) -- pair
-TR opt: nested-let-loop.rkt 53:20 (loop1 (cdr x) (+ r s)) -- call to fun with unboxed args
-TR opt: nested-let-loop.rkt 54:38 s -- leave var unboxed
-TR opt: nested-let-loop.rkt 54:40 (car x) -- unbox float-complex
-TR opt: nested-let-loop.rkt 54:40 (car x) -- pair
-TR opt: nested-let-loop.rkt 54:48 (car y) -- unbox float-complex
-TR opt: nested-let-loop.rkt 54:48 (car y) -- pair
-TR opt: nested-let-loop.rkt 54:35 (+ s (car x) (car y)) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 53:35 (+ r s) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 53:35 (+ r s) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 53:35 (+ r s) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 53:38 r -- leave var unboxed
+TR opt: nested-let-loop.rkt 53:38 r -- leave var unboxed
+TR opt: nested-let-loop.rkt 53:38 r -- unbox float-complex
+TR opt: nested-let-loop.rkt 53:40 s -- leave var unboxed
+TR opt: nested-let-loop.rkt 53:40 s -- unbox float-complex
+TR opt: nested-let-loop.rkt 53:40 s -- unbox float-complex
+TR opt: nested-let-loop.rkt 54:20 (loop2 (cdr y) (+ s (car x) (car y))) -- call to fun with unboxed args
 TR opt: nested-let-loop.rkt 54:20 (loop2 (cdr y) (+ s (car x) (car y))) -- unboxed call site
 TR opt: nested-let-loop.rkt 54:27 (cdr y) -- pair
-TR opt: nested-let-loop.rkt 54:20 (loop2 (cdr y) (+ s (car x) (car y))) -- call to fun with unboxed args
-TR opt: nested-let-loop.rkt 51:38 0.0+0.0i -- unboxed literal
-TR opt: nested-let-loop.rkt 49:10 (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))) -- unboxed call site
-TR opt: nested-let-loop.rkt 49:16 loop2 -- unboxed let loop
-TR opt: nested-let-loop.rkt 46:28 0.0+0.0i -- unboxed literal
-TR opt: nested-let-loop.rkt 44:0 (let: loop1 : Float-Complex ((x : (Listof Float-Complex) (quote (1.0+2.0i 2.0+4.0i))) (r : Float-Complex 0.0+0.0i)) (if (null? x) r (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))))) -- unboxed call site
-TR opt: nested-let-loop.rkt 44:6 loop1 -- unboxed let loop
+TR opt: nested-let-loop.rkt 54:35 (+ s (car x) (car y)) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 54:38 s -- leave var unboxed
+TR opt: nested-let-loop.rkt 54:40 (car x) -- pair
+TR opt: nested-let-loop.rkt 54:40 (car x) -- unbox float-complex
+TR opt: nested-let-loop.rkt 54:48 (car y) -- pair
+TR opt: nested-let-loop.rkt 54:48 (car y) -- unbox float-complex
 END
 #<<END
 20.0+40.0i
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 01350a8cec..a5b1ed60ec 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,22 @@
 #;#;
 #<<END
-TR opt: nested-unboxed-let.rkt 30:14 x -- unbox float-complex
-TR opt: nested-unboxed-let.rkt 30:16 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 30:11 (+ x 2.0+3.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 29: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:12 1.0+2.0i -- unboxed literal
 TR opt: nested-unboxed-let.rkt 29:21 2.0+3.0i -- unboxed literal
 TR opt: nested-unboxed-let.rkt 29:9 (+ 1.0+2.0i 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 29:0 (let ((x (+ 1.0+2.0i 2.0+3.0i))) (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i))) -- unboxed let bindings
+TR opt: nested-unboxed-let.rkt 30:11 (+ x 2.0+3.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 30:11 (+ x 2.0+3.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 30:14 x -- leave var unboxed
+TR opt: nested-unboxed-let.rkt 30:14 x -- unbox float-complex
+TR opt: nested-unboxed-let.rkt 30:16 2.0+3.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 30:16 2.0+3.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 30:2 (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i)) -- unboxed let bindings
+TR opt: nested-unboxed-let.rkt 31:4 (+ x 3.0+6.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 31:4 (+ x 3.0+6.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 31:7 x -- leave var unboxed
 TR opt: nested-unboxed-let.rkt 31:7 x -- unbox float-complex
 TR opt: nested-unboxed-let.rkt 31:9 3.0+6.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 31:4 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 30:14 x -- leave var unboxed
-TR opt: nested-unboxed-let.rkt 30:16 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 30:11 (+ x 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 30:2 (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i)) -- unboxed let bindings
-TR opt: nested-unboxed-let.rkt 31:7 x -- leave var unboxed
 TR opt: nested-unboxed-let.rkt 31:9 3.0+6.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 31:4 (+ x 3.0+6.0i) -- unboxed binary float complex
 END
 #<<END
 8.0+14.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt
index 08b93706df..ef574fdd14 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
@@ -7,11 +7,11 @@ TR opt: pair-known-length-list.rkt 32:5 (cdr x) -- pair
 TR opt: pair-known-length-list.rkt 33:0 (cdr (cdr x)) -- pair
 TR opt: pair-known-length-list.rkt 33:5 (cdr x) -- pair
 TR opt: pair-known-length-list.rkt 34:0 (car (cdr (cdr x))) -- pair
-TR opt: pair-known-length-list.rkt 34:5 (cdr (cdr x)) -- pair
 TR opt: pair-known-length-list.rkt 34:10 (cdr x) -- pair
+TR opt: pair-known-length-list.rkt 34:5 (cdr (cdr x)) -- pair
 TR opt: pair-known-length-list.rkt 35:0 (cdr (cdr (cdr x))) -- pair
-TR opt: pair-known-length-list.rkt 35:5 (cdr (cdr x)) -- pair
 TR opt: pair-known-length-list.rkt 35:10 (cdr x) -- pair
+TR opt: pair-known-length-list.rkt 35:5 (cdr (cdr x)) -- pair
 END
 #<<END
 1
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt
index 18a7ef747d..1d8a4ef8d0 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,11 +1,5 @@
 #;#;
 #<<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
@@ -32,6 +26,12 @@ 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
+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
 END
 #<<END
 -6.0-2.3i
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 bba2007da0..5f91f4169a 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,21 @@
 #;#;
 #<<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: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:13 v -- unboxed var -> table
+TR opt: real-part-loop.rkt 31:15 0.0+1.0i -- unboxed literal
 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 31:6 loop -- unboxed let loop
 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:20 v -- unbox float-complex
+TR opt: real-part-loop.rkt 32:20 v -- unboxed complex variable
 TR opt: real-part-loop.rkt 32:6 (> (real-part v) 70000.2) -- binary float comp
+TR opt: real-part-loop.rkt 32:9 (real-part v) -- complex accessor elimination
+TR opt: real-part-loop.rkt 32:9 (real-part v) -- unboxed unary float complex
+TR opt: real-part-loop.rkt 34:12 (+ v 3.6) -- unboxed binary float complex
 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
+TR opt: real-part-loop.rkt 34:6 (loop (+ v 3.6)) -- unboxed call site
 END
 #<<END
 0
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 a7c9628451..a58dcd5eeb 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,8 +1,8 @@
 #;#;
 #<<END
+TR missed opt: sqrt-segfault.rkt 21:31 (sqrt dist2) -- unexpected complex type
 TR opt: sqrt-segfault.rkt 19:14 (- 0.0 0.0) -- binary float
 TR opt: sqrt-segfault.rkt 20:14 (* dx dx) -- binary float
-TR missed opt: sqrt-segfault.rkt 21:31 (sqrt dist2) -- unexpected complex type
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum-nested.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum-nested.rkt
index 9f0afda532..d64a7c4479 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,8 @@
 #;#;
 #<<END
-TR opt: unary-fixnum-nested.rkt 15:26 (length (quote (1 2 3))) -- known-length list length
-TR opt: unary-fixnum-nested.rkt 15:13 (bitwise-not (length (quote (1 2 3)))) -- unary fixnum
 TR opt: unary-fixnum-nested.rkt 15:0 (bitwise-not (bitwise-not (length (quote (1 2 3))))) -- unary fixnum
+TR opt: unary-fixnum-nested.rkt 15:13 (bitwise-not (length (quote (1 2 3)))) -- unary fixnum
+TR opt: unary-fixnum-nested.rkt 15:26 (length (quote (1 2 3))) -- known-length list length
 END
 #<<END
 3
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 4c52527c1c..0674bd74d4 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,19 @@
 #;#;
 #<<END
-TR opt: unboxed-exp.rkt 32:50 p -- unbox float-complex
 TR opt: unboxed-exp.rkt 32:39 (real-part p) -- complex accessor elimination
-TR opt: unboxed-exp.rkt 33:50 p -- unbox float-complex
+TR opt: unboxed-exp.rkt 32:50 p -- unbox float-complex
 TR opt: unboxed-exp.rkt 33:39 (imag-part p) -- complex accessor elimination
-TR opt: unboxed-exp.rkt 35:30 2.0+3.4i -- unboxed literal
+TR opt: unboxed-exp.rkt 33:50 p -- unbox float-complex
 TR opt: unboxed-exp.rkt 35:25 (exp 2.0+3.4i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 36:30 0.0+0.0i -- unboxed literal
+TR opt: unboxed-exp.rkt 35:30 2.0+3.4i -- unboxed literal
 TR opt: unboxed-exp.rkt 36:25 (exp 0.0+0.0i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 37:30 -12.2-4.7i -- unboxed literal
+TR opt: unboxed-exp.rkt 36:30 0.0+0.0i -- unboxed literal
 TR opt: unboxed-exp.rkt 37:25 (exp -12.2-4.7i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 38:30 12.2-4.7i -- unboxed literal
+TR opt: unboxed-exp.rkt 37: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 38: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 39:30 -12.2+4.7i -- unboxed literal
 END
 #<<END
 "-7.14373-1.88821"
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-for.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-for.rkt
index edb762ba29..3b16e594a0 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,39 @@
 #;#;
 #<<END
 TR opt: unboxed-for.rkt 43:0 #%module-begin -- in-list
-TR opt: unboxed-for.rkt 48:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 48:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 46:31 sum -- unboxed var -> table
-TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- fun -> unboxed fun
-TR opt: unboxed-for.rkt 46:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 48:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unbox float-complex
-TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
-TR opt: unboxed-for.rkt 47:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 47:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 48:9 i -- leave var unboxed
-TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 46:31 sum -- leave var unboxed
-TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
-TR opt: unboxed-for.rkt 48:9 i -- leave var unboxed
-TR opt: unboxed-for.rkt 48:11 sum -- leave var unboxed
-TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 47:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 46:31 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
 TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- call to fun with unboxed args
-TR opt: unboxed-for.rkt 46:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 46:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 46:53 0.0+0.0i -- unboxed literal
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- fun -> unboxed fun
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unbox float-complex
 TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
+TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
 TR opt: unboxed-for.rkt 46:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let loop
+TR opt: unboxed-for.rkt 46:31 sum -- leave var unboxed
+TR opt: unboxed-for.rkt 46:31 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 46:31 sum -- unboxed complex variable
+TR opt: unboxed-for.rkt 46:31 sum -- unboxed complex variable
+TR opt: unboxed-for.rkt 46:31 sum -- unboxed complex variable
+TR opt: unboxed-for.rkt 46:31 sum -- unboxed var -> table
+TR opt: unboxed-for.rkt 46:53 0.0+0.0i -- unboxed literal
+TR opt: unboxed-for.rkt 47:13 i -- unboxed complex variable
+TR opt: unboxed-for.rkt 47:13 i -- unboxed complex variable
+TR opt: unboxed-for.rkt 47:13 i -- unboxed complex variable
+TR opt: unboxed-for.rkt 48:11 sum -- leave var unboxed
+TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 48:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 48:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 48:9 i -- leave var unboxed
+TR opt: unboxed-for.rkt 48:9 i -- leave var unboxed
+TR opt: unboxed-for.rkt 48:9 i -- unbox float-complex
+TR opt: unboxed-for.rkt 48:9 i -- unbox float-complex
+TR opt: unboxed-for.rkt 48:9 i -- unbox float-complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions1.rkt
index 80288526e9..c666dce74a 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,18 @@
 #;#;
 #<<END
+TR opt: unboxed-let-functions1.rkt 26:20 x -- unboxed var -> table
+TR opt: unboxed-let-functions1.rkt 26:42 (+ x 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions1.rkt 26:42 (+ x 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions1.rkt 26:45 x -- leave var unboxed
 TR opt: unboxed-let-functions1.rkt 26:45 x -- unbox float-complex
 TR opt: unboxed-let-functions1.rkt 26:47 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 26:42 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 26:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions1.rkt 26:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions1.rkt 26:45 x -- leave var unboxed
 TR opt: unboxed-let-functions1.rkt 26:47 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 26:42 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 27:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions1.rkt 26:7 f -- fun -> unboxed fun
 TR opt: unboxed-let-functions1.rkt 27:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 27:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 27:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
 TR opt: unboxed-let-functions1.rkt 27:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
+TR opt: unboxed-let-functions1.rkt 27:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
+TR opt: unboxed-let-functions1.rkt 27:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions1.rkt 27:8 1.0+2.0i -- unboxed literal
 END
 #<<END
 6.0+12.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions2.rkt
index 7c48c80c5a..457e729372 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,23 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions2.rkt 32:21 x -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 32:23 y -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 32:18 (+ x y) -- unboxed binary float complex
 TR opt: unboxed-let-functions2.rkt 31:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions2.rkt 32:21 x -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 32:23 y -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 32:18 (+ x y) -- unboxed binary float complex
 TR opt: unboxed-let-functions2.rkt 31:42 y -- unboxed var -> table
 TR opt: unboxed-let-functions2.rkt 31:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions2.rkt 32:21 x -- leave var unboxed
-TR opt: unboxed-let-functions2.rkt 32:23 y -- leave var unboxed
 TR opt: unboxed-let-functions2.rkt 32:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 33:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions2.rkt 32:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 32:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 32:21 x -- leave var unboxed
+TR opt: unboxed-let-functions2.rkt 32:21 x -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 32:21 x -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 32:23 y -- leave var unboxed
+TR opt: unboxed-let-functions2.rkt 32:23 y -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 32:23 y -- unbox float-complex
 TR opt: unboxed-let-functions2.rkt 33:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 33:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 34:5 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 33:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- unboxed call site
 TR opt: unboxed-let-functions2.rkt 33:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- call to fun with unboxed args
+TR opt: unboxed-let-functions2.rkt 33:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- unboxed call site
+TR opt: unboxed-let-functions2.rkt 33:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 33:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions2.rkt 34:5 3.0+6.0i -- unboxed literal
 END
 #<<END
 6.0+12.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions3.rkt
index 9d2bf33f93..61844d099f 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,18 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions3.rkt 27:21 x -- unbox float-complex
-TR opt: unboxed-let-functions3.rkt 27:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions3.rkt 27:18 (+ x y) -- unboxed binary float complex
 TR opt: unboxed-let-functions3.rkt 26:20 x -- unboxed var -> table
 TR opt: unboxed-let-functions3.rkt 26:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions3.rkt 27:21 x -- leave var unboxed
-TR opt: unboxed-let-functions3.rkt 27:23 y -- float-arg-expr in complex ops
 TR opt: unboxed-let-functions3.rkt 27:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 28:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions3.rkt 27:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions3.rkt 27:21 x -- leave var unboxed
+TR opt: unboxed-let-functions3.rkt 27:21 x -- unbox float-complex
+TR opt: unboxed-let-functions3.rkt 27:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions3.rkt 27:23 y -- float-arg-expr in complex ops
 TR opt: unboxed-let-functions3.rkt 28:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions3.rkt 28:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 28:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- unboxed call site
 TR opt: unboxed-let-functions3.rkt 28:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- call to fun with unboxed args
+TR opt: unboxed-let-functions3.rkt 28:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- unboxed call site
+TR opt: unboxed-let-functions3.rkt 28:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions3.rkt 28:8 1.0+2.0i -- unboxed literal
 END
 #<<END
 6.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions4.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions4.rkt
index ed998dfe5b..66a68ccff5 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,18 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions4.rkt 27:21 x -- unbox float-complex
-TR opt: unboxed-let-functions4.rkt 27:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions4.rkt 27:18 (+ x y) -- unboxed binary float complex
 TR opt: unboxed-let-functions4.rkt 26:32 x -- unboxed var -> table
 TR opt: unboxed-let-functions4.rkt 26:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions4.rkt 27:21 x -- leave var unboxed
-TR opt: unboxed-let-functions4.rkt 27:23 y -- float-arg-expr in complex ops
 TR opt: unboxed-let-functions4.rkt 27:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 29:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions4.rkt 27:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions4.rkt 27:21 x -- leave var unboxed
+TR opt: unboxed-let-functions4.rkt 27:21 x -- unbox float-complex
+TR opt: unboxed-let-functions4.rkt 27:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions4.rkt 27:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions4.rkt 28:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
+TR opt: unboxed-let-functions4.rkt 28:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
 TR opt: unboxed-let-functions4.rkt 29:17 2.0+4.0i -- unboxed literal
 TR opt: unboxed-let-functions4.rkt 29:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 28:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
-TR opt: unboxed-let-functions4.rkt 28:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
+TR opt: unboxed-let-functions4.rkt 29:8 1.0+2.0i -- unboxed literal
 END
 #<<END
 6.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions5.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions5.rkt
index 1962adcceb..906a7b2485 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,8 @@
 #;#;
 #<<END
+TR opt: unboxed-let-functions5.rkt 22:12 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 TR opt: unboxed-let-functions5.rkt 22:15 1.0+2.0i -- unboxed literal
 TR opt: unboxed-let-functions5.rkt 22:24 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions5.rkt 22:12 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions6.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions6.rkt
index 43f04d138c..a207ad2f31 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,23 @@
 #;#;
 #<<END
+TR opt: unboxed-let-functions6.rkt 30:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) (+ z 0.0+1.0i) (loop (+ z (car l)) (cdr l)))) -- unboxed call site
+TR opt: unboxed-let-functions6.rkt 30:31 z -- unboxed var -> table
+TR opt: unboxed-let-functions6.rkt 30:51 0.0+0.0i -- unboxed literal
+TR opt: unboxed-let-functions6.rkt 30:6 loop -- fun -> unboxed fun
+TR opt: unboxed-let-functions6.rkt 30:6 loop -- unboxed let loop
+TR opt: unboxed-let-functions6.rkt 33:10 (+ z 0.0+1.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions6.rkt 33:10 (+ z 0.0+1.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions6.rkt 33:13 z -- leave var unboxed
 TR opt: unboxed-let-functions6.rkt 33:13 z -- unbox float-complex
 TR opt: unboxed-let-functions6.rkt 33:15 0.0+1.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 33:10 (+ z 0.0+1.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 30:31 z -- unboxed var -> table
-TR opt: unboxed-let-functions6.rkt 30:6 loop -- fun -> unboxed fun
-TR opt: unboxed-let-functions6.rkt 33:13 z -- leave var unboxed
 TR opt: unboxed-let-functions6.rkt 33:15 0.0+1.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 33:10 (+ z 0.0+1.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 34:19 z -- leave var unboxed
-TR opt: unboxed-let-functions6.rkt 34:21 (car l) -- pair
-TR opt: unboxed-let-functions6.rkt 34:21 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions6.rkt 34:16 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 34:10 (loop (+ z (car l)) (cdr l)) -- unboxed call site
-TR opt: unboxed-let-functions6.rkt 35:16 (cdr l) -- pair
 TR opt: unboxed-let-functions6.rkt 34:10 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions6.rkt 30:51 0.0+0.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 30:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) (+ z 0.0+1.0i) (loop (+ z (car l)) (cdr l)))) -- unboxed call site
-TR opt: unboxed-let-functions6.rkt 30:6 loop -- unboxed let loop
+TR opt: unboxed-let-functions6.rkt 34:10 (loop (+ z (car l)) (cdr l)) -- unboxed call site
+TR opt: unboxed-let-functions6.rkt 34:16 (+ z (car l)) -- unboxed binary float complex
+TR opt: unboxed-let-functions6.rkt 34:19 z -- leave var unboxed
+TR opt: unboxed-let-functions6.rkt 34:21 (car l) -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions6.rkt 34:21 (car l) -- pair
+TR opt: unboxed-let-functions6.rkt 35:16 (cdr l) -- pair
 END
 #<<END
 6.0+1.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions7.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions7.rkt
index 413af0fa0d..b2b61b70ed 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,22 @@
 #;#;
 #<<END
-TR opt: unboxed-let-functions7.rkt 34:15 z -- unbox float-complex
-TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- pair
-TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions7.rkt 34:12 (+ z (car l)) -- unboxed binary float complex
+TR opt: unboxed-let-functions7.rkt 30:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) z (loop (+ z (car l)) (cdr l)))) -- unboxed call site
 TR opt: unboxed-let-functions7.rkt 30:31 z -- unboxed var -> table
+TR opt: unboxed-let-functions7.rkt 30:51 0.0+0.0i -- unboxed literal
 TR opt: unboxed-let-functions7.rkt 30:6 loop -- fun -> unboxed fun
+TR opt: unboxed-let-functions7.rkt 30:6 loop -- unboxed let loop
 TR opt: unboxed-let-functions7.rkt 33:6 z -- unboxed complex variable
-TR opt: unboxed-let-functions7.rkt 34:15 z -- leave var unboxed
-TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- pair
-TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- float-arg-expr in complex ops
 TR opt: unboxed-let-functions7.rkt 34:12 (+ z (car l)) -- unboxed binary float complex
+TR opt: unboxed-let-functions7.rkt 34:12 (+ z (car l)) -- unboxed binary float complex
+TR opt: unboxed-let-functions7.rkt 34:15 z -- leave var unboxed
+TR opt: unboxed-let-functions7.rkt 34:15 z -- unbox float-complex
+TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- pair
+TR opt: unboxed-let-functions7.rkt 34:17 (car l) -- pair
+TR opt: unboxed-let-functions7.rkt 34:6 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
 TR opt: unboxed-let-functions7.rkt 34:6 (loop (+ z (car l)) (cdr l)) -- unboxed call site
 TR opt: unboxed-let-functions7.rkt 35:12 (cdr l) -- pair
-TR opt: unboxed-let-functions7.rkt 34:6 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions7.rkt 30:51 0.0+0.0i -- unboxed literal
-TR opt: unboxed-let-functions7.rkt 30:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) z (loop (+ z (car l)) (cdr l)))) -- unboxed call site
-TR opt: unboxed-let-functions7.rkt 30:6 loop -- unboxed let loop
 END
 #<<END
 6.0+0.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions8.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let-functions8.rkt
index 1d69e1afa2..6f9bdaf5ca 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,8 @@
 #;#;
 #<<END
+TR opt: unboxed-let-functions8.rkt 17:64 (+ x 2.0+4.0i) -- unboxed binary float complex
 TR opt: unboxed-let-functions8.rkt 17:67 x -- unbox float-complex
 TR opt: unboxed-let-functions8.rkt 17:69 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions8.rkt 17:64 (+ x 2.0+4.0i) -- unboxed binary float complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let.rkt
index 00b5225edb..df12e81659 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,27 @@
 #;#;
 #<<END
-TR opt: unboxed-let.rkt 37:14 t1 -- unbox float-complex
-TR opt: unboxed-let.rkt 37:17 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let.rkt 37:11 (- t1 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 36: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 36:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
+TR opt: unboxed-let.rkt 36:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
+TR opt: unboxed-let.rkt 36:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 TR opt: unboxed-let.rkt 36:14 1.0+2.0i -- unboxed literal
 TR opt: unboxed-let.rkt 36:23 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let.rkt 36:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 36:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
-TR opt: unboxed-let.rkt 39:5 t2 -- unbox float-complex
-TR opt: unboxed-let.rkt 39:8 t3 -- unbox float-complex
-TR opt: unboxed-let.rkt 39:2 (+ t2 t3) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 37:14 t1 -- leave var unboxed
-TR opt: unboxed-let.rkt 37:17 3.0+6.0i -- unboxed literal
 TR opt: unboxed-let.rkt 37:11 (- t1 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 36:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
-TR opt: unboxed-let.rkt 39:5 t2 -- leave var unboxed
-TR opt: unboxed-let.rkt 39:8 t3 -- unbox float-complex
-TR opt: unboxed-let.rkt 39:2 (+ t2 t3) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 37:11 (- t1 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 37:14 t1 -- leave var unboxed
+TR opt: unboxed-let.rkt 37:14 t1 -- unbox float-complex
+TR opt: unboxed-let.rkt 37:17 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let.rkt 37:17 3.0+6.0i -- unboxed literal
 TR opt: unboxed-let.rkt 38:11 4.0+8.0i -- unboxed literal
-TR opt: unboxed-let.rkt 36:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
-TR opt: unboxed-let.rkt 39:5 t2 -- leave var unboxed
-TR opt: unboxed-let.rkt 39:8 t3 -- leave var unboxed
 TR opt: unboxed-let.rkt 39:2 (+ t2 t3) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 39:2 (+ t2 t3) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 39:2 (+ t2 t3) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 39:5 t2 -- leave var unboxed
+TR opt: unboxed-let.rkt 39:5 t2 -- leave var unboxed
+TR opt: unboxed-let.rkt 39:5 t2 -- unbox float-complex
+TR opt: unboxed-let.rkt 39:8 t3 -- leave var unboxed
+TR opt: unboxed-let.rkt 39:8 t3 -- unbox float-complex
+TR opt: unboxed-let.rkt 39:8 t3 -- unbox float-complex
 END
 #<<END
 4.0+8.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let2.rkt
index d2401f798e..0b12fe8d93 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,21 @@
 #;#;
 #<<END
-TR opt: unboxed-let2.rkt 30:5 t1 -- unbox float-complex
-TR opt: unboxed-let2.rkt 30:8 t2 -- unbox float-complex
-TR opt: unboxed-let2.rkt 30:2 (+ t1 t2) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 30:5 t1 -- unbox float-complex
-TR opt: unboxed-let2.rkt 30:8 t2 -- unbox float-complex
-TR opt: unboxed-let2.rkt 30:2 (+ t1 t2) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 28: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:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 TR opt: unboxed-let2.rkt 28:13 1.0+2.0i -- unboxed literal
 TR opt: unboxed-let2.rkt 28:22 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 28:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 29:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
 TR opt: unboxed-let2.rkt 29:13 3.0+6.0i -- unboxed literal
 TR opt: unboxed-let2.rkt 29:22 4.0+8.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 29:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 28:0 (let ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (+ 3.0+6.0i 4.0+8.0i))) (+ t1 t2)) -- unboxed let bindings
-TR opt: unboxed-let2.rkt 30:5 t1 -- leave var unboxed
-TR opt: unboxed-let2.rkt 30:8 t2 -- leave var unboxed
 TR opt: unboxed-let2.rkt 30:2 (+ t1 t2) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 30:2 (+ t1 t2) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 30:2 (+ t1 t2) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 30:5 t1 -- leave var unboxed
+TR opt: unboxed-let2.rkt 30:5 t1 -- unbox float-complex
+TR opt: unboxed-let2.rkt 30:5 t1 -- unbox float-complex
+TR opt: unboxed-let2.rkt 30:8 t2 -- leave var unboxed
+TR opt: unboxed-let2.rkt 30:8 t2 -- unbox float-complex
+TR opt: unboxed-let2.rkt 30:8 t2 -- unbox float-complex
 END
 #<<END
 10.0+20.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let3.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-let3.rkt
index 1328632ec5..fdddb34cca 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,16 @@
 #;#;
 #<<END
-TR opt: unboxed-let3.rkt 33:9 x -- unbox float-complex
-TR opt: unboxed-let3.rkt 33:11 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 33:6 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let3.rkt 30: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:12 1.0+2.0i -- unboxed literal
 TR opt: unboxed-let3.rkt 30:21 2.0+4.0i -- unboxed literal
 TR opt: unboxed-let3.rkt 30:9 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let3.rkt 30:0 (let ((x (+ 1.0+2.0i 2.0+4.0i))) (if (even? 2) x (+ x 2.0+4.0i))) -- unboxed let bindings
 TR opt: unboxed-let3.rkt 32:6 x -- unboxed complex variable
-TR opt: unboxed-let3.rkt 33:9 x -- leave var unboxed
+TR opt: unboxed-let3.rkt 33:11 2.0+4.0i -- unboxed literal
 TR opt: unboxed-let3.rkt 33:11 2.0+4.0i -- unboxed literal
 TR opt: unboxed-let3.rkt 33:6 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let3.rkt 33:6 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let3.rkt 33:9 x -- leave var unboxed
+TR opt: unboxed-let3.rkt 33:9 x -- unbox float-complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec-syntaxes+values.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec-syntaxes+values.rkt
index 5e7368abcd..f4b2bb47f3 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,15 @@
 #;#;
 #<<END
-TR opt: unboxed-letrec-syntaxes+values.rkt 24:27 x -- unbox float-complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 24:29 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 24:24 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-letrec-syntaxes+values.rkt 22:0 (letrec-syntaxes+values (((s) (syntax-rules () ((_ x) x)))) (((x) (+ 1.0+2.0i 2.0+4.0i))) (+ x 2.0+4.0i)) -- unboxed let bindings
+TR opt: unboxed-letrec-syntaxes+values.rkt 23:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 TR opt: unboxed-letrec-syntaxes+values.rkt 23:33 1.0+2.0i -- unboxed literal
 TR opt: unboxed-letrec-syntaxes+values.rkt 23:42 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 23:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 22:0 (letrec-syntaxes+values (((s) (syntax-rules () ((_ x) x)))) (((x) (+ 1.0+2.0i 2.0+4.0i))) (+ x 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-letrec-syntaxes+values.rkt 24:27 x -- leave var unboxed
-TR opt: unboxed-letrec-syntaxes+values.rkt 24:29 2.0+4.0i -- unboxed literal
 TR opt: unboxed-letrec-syntaxes+values.rkt 24:24 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:24 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:27 x -- leave var unboxed
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:27 x -- unbox float-complex
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:29 2.0+4.0i -- unboxed literal
+TR opt: unboxed-letrec-syntaxes+values.rkt 24:29 2.0+4.0i -- unboxed literal
 END
 #<<END
 5.0+10.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-letrec.rkt
index efff82210b..5561fb3ede 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,19 @@
 #;#;
 #<<END
-TR opt: unboxed-letrec.rkt 31:5 x -- unbox float-complex
-TR opt: unboxed-letrec.rkt 31:7 y -- unbox float-complex
-TR opt: unboxed-letrec.rkt 31:2 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 31:5 x -- unbox float-complex
-TR opt: unboxed-letrec.rkt 31:7 y -- unbox float-complex
-TR opt: unboxed-letrec.rkt 31:2 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-letrec.rkt 28:0 (letrec: ((f : (Any -> Any) (lambda: ((x : Any)) (f x))) (x : Float-Complex 1.0+2.0i) (y : Float-Complex (+ 2.0+4.0i 3.0+6.0i))) (+ x y)) -- unboxed let bindings
 TR opt: unboxed-letrec.rkt 29:31 1.0+2.0i -- unboxed literal
+TR opt: unboxed-letrec.rkt 30:31 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 TR opt: unboxed-letrec.rkt 30:34 2.0+4.0i -- unboxed literal
 TR opt: unboxed-letrec.rkt 30:43 3.0+6.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 30:31 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 28:0 (letrec: ((f : (Any -> Any) (lambda: ((x : Any)) (f x))) (x : Float-Complex 1.0+2.0i) (y : Float-Complex (+ 2.0+4.0i 3.0+6.0i))) (+ x y)) -- unboxed let bindings
-TR opt: unboxed-letrec.rkt 31:5 x -- leave var unboxed
-TR opt: unboxed-letrec.rkt 31:7 y -- leave var unboxed
 TR opt: unboxed-letrec.rkt 31:2 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-letrec.rkt 31:2 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-letrec.rkt 31:2 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-letrec.rkt 31:5 x -- leave var unboxed
+TR opt: unboxed-letrec.rkt 31:5 x -- unbox float-complex
+TR opt: unboxed-letrec.rkt 31:5 x -- unbox float-complex
+TR opt: unboxed-letrec.rkt 31:7 y -- leave var unboxed
+TR opt: unboxed-letrec.rkt 31:7 y -- unbox float-complex
+TR opt: unboxed-letrec.rkt 31:7 y -- unbox float-complex
 END
 #<<END
 6.0+12.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-make-rectangular.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unboxed-make-rectangular.rkt
index 462eb35c48..275aa1d7ba 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,21 @@
 #;#;
 #<<END
+TR opt: unboxed-make-rectangular.rkt 32:0 (let ((x (make-rectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
+TR opt: unboxed-make-rectangular.rkt 32:9 (make-rectangular 1.0 2.0) -- make-rectangular elimination
+TR opt: unboxed-make-rectangular.rkt 33:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 33:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 33:5 x -- leave var unboxed
 TR opt: unboxed-make-rectangular.rkt 33:5 x -- unbox float-complex
 TR opt: unboxed-make-rectangular.rkt 33:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 33:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 32:9 (make-rectangular 1.0 2.0) -- make-rectangular elimination
-TR opt: unboxed-make-rectangular.rkt 32:0 (let ((x (make-rectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-make-rectangular.rkt 33:5 x -- leave var unboxed
 TR opt: unboxed-make-rectangular.rkt 33:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 33:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 34:0 (let ((x (unsafe-make-flrectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
+TR opt: unboxed-make-rectangular.rkt 34:9 (unsafe-make-flrectangular 1.0 2.0) -- make-rectangular elimination
+TR opt: unboxed-make-rectangular.rkt 35:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 35:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 35:5 x -- leave var unboxed
 TR opt: unboxed-make-rectangular.rkt 35:5 x -- unbox float-complex
 TR opt: unboxed-make-rectangular.rkt 35:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 35:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 34:9 (unsafe-make-flrectangular 1.0 2.0) -- make-rectangular elimination
-TR opt: unboxed-make-rectangular.rkt 34:0 (let ((x (unsafe-make-flrectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-make-rectangular.rkt 35:5 x -- leave var unboxed
 TR opt: unboxed-make-rectangular.rkt 35:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 35:2 (+ x 2.0+4.0i) -- unboxed binary float complex
 END
 #<<END
 3.0+6.0i
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt
index 9930913072..ea0e8dc815 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,92 +1,92 @@
 #;#;
 #<<END
+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 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 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 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)))) -- 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)))) -- 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)))) -- 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 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)))) -- 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)))) -- 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)))) -- 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)))) -- 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)))) -- 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)))) -- 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)))) -- 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)))) -- 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)))) -- fixnum bounded expr
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
+TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary 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:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
+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:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
+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:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+TR opt: vector-sum.rkt 105:15 sum -- dead else branch
+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))) -- binary fixnum comp
+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: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: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: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))) -- 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))) -- 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))) -- fixnum bounded expr
+TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
+TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
+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 107:4 (+ sum (vector-ref v i)) -- binary float
+TR opt: vector-sum.rkt 107:4 (+ sum (vector-ref v i)) -- binary float
+TR opt: vector-sum.rkt 107:4 (+ sum (vector-ref v i)) -- binary float
 TR opt: vector-sum.rkt 93:0 #%module-begin -- dead else branch
 TR opt: vector-sum.rkt 93:0 #%module-begin -- dead else branch
 TR opt: vector-sum.rkt 93:0 #%module-begin -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 104:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 104:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
-TR opt: vector-sum.rkt 105:15 sum -- dead else branch
-TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 107:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 105:15 sum -- dead else branch
-TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
-TR opt: vector-sum.rkt 105:15 sum -- dead else branch
-TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 107:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 105:15 sum -- dead else branch
-TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 104:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 104:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 104:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 104:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 103:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
-TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
-TR opt: vector-sum.rkt 105:15 sum -- dead else branch
-TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 107:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 105:15 sum -- dead else branch
-TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- binary fixnum comp
-TR opt: vector-sum.rkt 105:15 sum -- dead else branch
-TR opt: vector-sum.rkt 107:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 107:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 105:15 sum -- dead else branch
-TR opt: vector-sum.rkt 105:2 (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 102:0 (for ((i (in-range 1))) (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) (for/fold: ((sum : Float 0.0)) ((i : Nonnegative-Fixnum (in-range l))) (+ sum (vector-ref v i)))) -- dead else branch
 END
 ""
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/zero.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/zero.rkt
index 941377a958..2289a5de7c 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,8 @@
 #;#;
 #<<END
 TR opt: zero.rkt 16:0 (zero? 1) -- fixnum zero?
-TR opt: zero.rkt 17:7 (sqrt 3.0) -- unary float
 TR opt: zero.rkt 17:0 (zero? (sqrt 3.0)) -- float zero?
+TR opt: zero.rkt 17:7 (sqrt 3.0) -- unary float
 END
 #<<END
 #f
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
index 0c66b46785..97b5ba0553 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
@@ -92,4 +92,4 @@
               (namespace-attach-module orig-namespace 'racket)
               (namespace-attach-module orig-namespace 'typed-racket/core)
               (dynamic-require file #f)))))))
-  (list (queue->list tr-logs) regular-output))
+  (list (sort (queue->list tr-logs) string<?) regular-output))