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 35398a96..f4fbc04e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/all-real.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/all-real.rkt
@@ -1,10 +1,13 @@
 #;
-(
-TR missed opt: all-real.rkt 24:0 (+ (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 24:8 3, 24:21 4
-TR info: all-real.rkt 24:0 (+ (ann 3 Real) (ann 4 Real)) -- exact real arith
-TR missed opt: all-real.rkt 25:0 (* (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 25:8 3, 25:21 4
-TR info: all-real.rkt 25:0 (* (ann 3 Real) (ann 4 Real)) -- exact real arith
-7 12)
+#<<END
+TR missed opt: all-real.rkt 27:0 (+ (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 27:8 3, 27:21 4
+TR info: all-real.rkt 27:0 (+ (ann 3 Real) (ann 4 Real)) -- exact real arith
+TR missed opt: all-real.rkt 28:0 (* (ann 3 Real) (ann 4 Real)) -- all args float-arg-expr, result not Float -- caused by: 28:8 3, 28:21 4
+TR info: all-real.rkt 28:0 (* (ann 3 Real) (ann 4 Real)) -- exact real arith
+7
+12
+
+END
 
 #lang typed/racket
 
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 d6cff220..ad4276a6 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 @@
 #;
-(
-TR opt: fixnum.rkt 35:10 (* x y) -- fixnum bounded expr
-TR missed opt: fixnum.rkt 38:0 (+ (ann z Fixnum) 234) -- out of fixnum range
-TR missed opt: fixnum.rkt 39:0 (* (ann x Index) (ann y Index)) -- out of fixnum range
-TR opt: fixnum.rkt 42:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 42:15 (+ 301 302) -- fixnum bounded expr
-TR missed opt: fixnum.rkt 42:0 (+ (+ 300 301) (+ 301 302)) -- out of fixnum range
-TR opt: fixnum.rkt 42:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 42:15 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 42:3 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 42:15 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 43:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 43:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum.rkt 43:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum.rkt 43:17 (+ 301 302) -- fixnum bounded expr
+#<<END
+TR opt: fixnum.rkt 36:10 (* x y) -- fixnum bounded expr
+TR missed opt: fixnum.rkt 39:0 (+ (ann z Fixnum) 234) -- out of fixnum range
+TR missed opt: fixnum.rkt 40:0 (* (ann x Index) (ann y Index)) -- out of fixnum range
+TR opt: fixnum.rkt 43:3 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 43:15 (+ 301 302) -- fixnum bounded expr
+TR missed opt: fixnum.rkt 43:0 (+ (+ 300 301) (+ 301 302)) -- out of fixnum range
+TR opt: fixnum.rkt 43:3 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 43:15 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum.rkt 43:3 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 43:15 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum.rkt 44:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 44:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum.rkt 44:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum.rkt 44:17 (+ 301 302) -- fixnum bounded expr
 468
 234
 234
@@ -21,7 +21,8 @@ TR opt: fixnum.rkt 43:17 (+ 301 302) -- fixnum bounded expr
 1204
 1204
 0
-)
+
+END
 #lang typed/racket
 
 (require racket/fixnum)
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 f00ed4cc..0389f3b8 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file1.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR missed opt: multi-file1.rkt 12:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 12:12 3
-TR info: multi-file1.rkt 12:2 (* x (ann 3 Integer)) -- exact real arith
-)
+#<<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
+
+END
 
 #lang typed/racket
 (provide f)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt
index 257f6893..9309a60d 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,11 +1,12 @@
 #;
-(
-TR missed opt: multi-file1.rkt 12:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 12:12 3
-TR info: multi-file1.rkt 12:2 (* x (ann 3 Integer)) -- exact real arith
-TR opt: multi-file2.rkt 13:10 (+ 3 5) -- fixnum bounded expr
-TR opt: multi-file2.rkt 13:3 (* 3.4 (+ 3 5)) -- binary float
+#<<END
+TR missed opt: multi-file1.rkt 13:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 13:12 3
+TR info: multi-file1.rkt 13:2 (* x (ann 3 Integer)) -- exact real arith
+TR opt: multi-file2.rkt 14:10 (+ 3 5) -- fixnum bounded expr
+TR opt: multi-file2.rkt 14:3 (* 3.4 (+ 3 5)) -- binary float
 81.6
-)
+
+END
 
 #lang typed/racket
 (require "multi-file1.rkt")
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 db8a1867..7f12230a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multiple-irritants.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multiple-irritants.rkt
@@ -1,8 +1,10 @@
 #;
-(
-TR missed opt: multiple-irritants.rkt 9:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- all args float-arg-expr, result not Float -- caused by: 9:8 4, 9:24 5
-TR info: multiple-irritants.rkt 9:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- exact real arith
-120.0)
+#<<END
+TR missed opt: multiple-irritants.rkt 11:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- all args float-arg-expr, result not Float -- caused by: 11:8 4, 11:24 5
+TR info: multiple-irritants.rkt 11:0 (* (ann 4 Integer) (ann 5 Integer) 6.0) -- exact real arith
+120.0
+
+END
 
 #lang typed/racket
 
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 b2791caa..4c4829ea 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,30 +1,31 @@
 #;
-(
-TR missed opt: nested-same-kind.rkt 34:7 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 34:19 4
-TR info: nested-same-kind.rkt 34:7 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 34:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 34:7 (* 3.0 (ann 4 Integer))
-TR info: nested-same-kind.rkt 34:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 35:14 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 35:26 4
-TR info: nested-same-kind.rkt 35:14 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 35:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 35:14 (* 3.0 (ann 4 Integer))
-TR info: nested-same-kind.rkt 35:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 35:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- all args float-arg-expr, result not Float -- caused by: 35:7 (* 2.0 (* 3.0 (ann 4 Integer)))
-TR info: nested-same-kind.rkt 35:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 36:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- all args float-arg-expr, result not Float -- caused by: 36:19 4, 36:35 5
-TR info: nested-same-kind.rkt 36:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 36:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- all args float-arg-expr, result not Float -- caused by: 36:7 (* 3.0 (ann 4 Integer) (ann 5 Integer))
-TR info: nested-same-kind.rkt 36:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- exact real arith
-TR missed opt: nested-same-kind.rkt 37:3 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 37:15 4
-TR info: nested-same-kind.rkt 37:3 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 37:27 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 37:39 4
-TR info: nested-same-kind.rkt 37:27 (* 3.0 (ann 4 Integer)) -- exact real arith
-TR missed opt: nested-same-kind.rkt 37:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 37:3 (* 3.0 (ann 4 Integer)), 37:27 (* 3.0 (ann 4 Integer))
-TR info: nested-same-kind.rkt 37:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- exact real arith
+#<<END
+TR missed opt: nested-same-kind.rkt 35:7 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 35:19 4
+TR info: nested-same-kind.rkt 35:7 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 35:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 35:7 (* 3.0 (ann 4 Integer))
+TR info: nested-same-kind.rkt 35:0 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
+TR missed opt: nested-same-kind.rkt 36:14 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 36:26 4
+TR info: nested-same-kind.rkt 36:14 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 36:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 36:14 (* 3.0 (ann 4 Integer))
+TR info: nested-same-kind.rkt 36:7 (* 2.0 (* 3.0 (ann 4 Integer))) -- exact real arith
+TR missed opt: nested-same-kind.rkt 36:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- all args float-arg-expr, result not Float -- caused by: 36:7 (* 2.0 (* 3.0 (ann 4 Integer)))
+TR info: nested-same-kind.rkt 36:0 (* 1.0 (* 2.0 (* 3.0 (ann 4 Integer)))) -- exact real arith
+TR missed opt: nested-same-kind.rkt 37:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- all args float-arg-expr, result not Float -- caused by: 37:19 4, 37:35 5
+TR info: nested-same-kind.rkt 37:7 (* 3.0 (ann 4 Integer) (ann 5 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 37:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- all args float-arg-expr, result not Float -- caused by: 37:7 (* 3.0 (ann 4 Integer) (ann 5 Integer))
+TR info: nested-same-kind.rkt 37:0 (* 2.0 (* 3.0 (ann 4 Integer) (ann 5 Integer))) -- exact real arith
+TR missed opt: nested-same-kind.rkt 38:3 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 38:15 4
+TR info: nested-same-kind.rkt 38:3 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 38:27 (* 3.0 (ann 4 Integer)) -- all args float-arg-expr, result not Float -- caused by: 38:39 4
+TR info: nested-same-kind.rkt 38:27 (* 3.0 (ann 4 Integer)) -- exact real arith
+TR missed opt: nested-same-kind.rkt 38:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- all args float-arg-expr, result not Float -- caused by: 38:3 (* 3.0 (ann 4 Integer)), 38:27 (* 3.0 (ann 4 Integer))
+TR info: nested-same-kind.rkt 38:0 (* (* 3.0 (ann 4 Integer)) (* 3.0 (ann 4 Integer))) -- exact real arith
 24.0
 24.0
 120.0
 144.0
-)
+
+END
 
 #lang typed/racket
 ;; when a single "bubble" causes missed optimizations to cascade, a single
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 884bae67..7ba3a940 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 @@
 #;
-(
-TR missed opt: pair.rkt 58:0 (car (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 58:10 (list 1 2 3)
-TR opt: pair.rkt 59:0 (car (list 1 2 3)) -- pair
-TR missed opt: pair.rkt 60:0 (cdr (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 60:10 (list 1 2 3)
-TR opt: pair.rkt 61:0 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 62:0 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 62:5 (cdr (list 1 2 3)) -- pair
-TR opt: pair.rkt 63:0 (cdr (cdr (cdr (list 1 2 3)))) -- pair
-TR opt: pair.rkt 63:5 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 63:10 (cdr (list 1 2 3)) -- pair
-TR missed opt: pair.rkt 64:16 (cdr (cdr (cdr (cdr (list 1 2 3))))) -- car/cdr on a potentially empty list -- caused by: 64:21 (cdr (cdr (cdr (list 1 2 3))))
-TR opt: pair.rkt 64:21 (cdr (cdr (cdr (list 1 2 3)))) -- pair
-TR opt: pair.rkt 64:26 (cdr (cdr (list 1 2 3))) -- pair
-TR opt: pair.rkt 64:31 (cdr (list 1 2 3)) -- pair
-TR missed opt: pair.rkt 67:0 (mcar (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 67:6 (values (ann (mlist 1) (MListof Byte)))
-TR opt: pair.rkt 68:0 (mcar (mlist 1 2 3)) -- pair
-TR missed opt: pair.rkt 69:0 (mcdr (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 69:6 (values (ann (mlist 1) (MListof Byte)))
-TR opt: pair.rkt 70:0 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 71:0 (mcdr (mcdr (mlist 1 2 3))) -- pair
-TR opt: pair.rkt 71:6 (mcdr (mlist 1 2 3)) -- pair
-TR opt: pair.rkt 72:0 (mcdr (mcdr (mcdr (mlist 1 2 3)))) -- pair
-TR opt: pair.rkt 72:6 (mcdr (mcdr (mlist 1 2 3))) -- pair
-TR opt: pair.rkt 72:12 (mcdr (mlist 1 2 3)) -- pair
-TR missed opt: pair.rkt 73:0 (set-mcar! (values (ann (mlist 2) (MListof Byte))) 2) -- car/cdr on a potentially empty list -- caused by: 73:11 (values (ann (mlist 2) (MListof Byte)))
-TR opt: pair.rkt 74:0 (set-mcar! (mlist 2 3 4) 2) -- pair
-TR missed opt: pair.rkt 75:0 (set-mcdr! (values (ann (mlist 2) (MListof Byte))) (values (ann (mlist 2) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 75:11 (values (ann (mlist 2) (MListof Byte)))
-TR opt: pair.rkt 77:0 (mcar (mcons 2 3)) -- pair
-TR opt: pair.rkt 78:0 (mcdr (mcons 2 3)) -- pair
-TR opt: pair.rkt 79:0 (set-mcar! (mcons 2 3) 3) -- pair
-TR opt: pair.rkt 80:0 (set-mcdr! (mcons 2 3) 4) -- pair
-TR missed opt: pair.rkt 81:17 (mcar (quote ())) -- car/cdr on a potentially empty list -- caused by: 81:23 (quote ())
-TR missed opt: pair.rkt 82:17 (mcdr (quote ())) -- car/cdr on a potentially empty list -- caused by: 82:23 (quote ())
-TR missed opt: pair.rkt 83:17 (set-mcar! (quote ()) 2) -- car/cdr on a potentially empty list -- caused by: 83:28 (quote ())
-TR missed opt: pair.rkt 84:17 (set-mcdr! (ann (quote ()) (MListof Integer)) (ann (mlist 3) (MListof Integer))) -- car/cdr on a potentially empty list -- caused by: 84:33 (quote ())
+#<<END
+TR missed opt: pair.rkt 59:0 (car (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 59:10 (list 1 2 3)
+TR opt: pair.rkt 60:0 (car (list 1 2 3)) -- pair
+TR missed opt: pair.rkt 61:0 (cdr (ann (list 1 2 3) (Listof Byte))) -- car/cdr on a potentially empty list -- caused by: 61:10 (list 1 2 3)
+TR opt: pair.rkt 62:0 (cdr (list 1 2 3)) -- pair
+TR opt: pair.rkt 63:0 (cdr (cdr (list 1 2 3))) -- pair
+TR opt: pair.rkt 63:5 (cdr (list 1 2 3)) -- pair
+TR opt: pair.rkt 64:0 (cdr (cdr (cdr (list 1 2 3)))) -- pair
+TR opt: pair.rkt 64:5 (cdr (cdr (list 1 2 3))) -- pair
+TR opt: pair.rkt 64:10 (cdr (list 1 2 3)) -- pair
+TR missed opt: pair.rkt 65:16 (cdr (cdr (cdr (cdr (list 1 2 3))))) -- car/cdr on a potentially empty list -- caused by: 65:21 (cdr (cdr (cdr (list 1 2 3))))
+TR opt: pair.rkt 65:21 (cdr (cdr (cdr (list 1 2 3)))) -- pair
+TR opt: pair.rkt 65:26 (cdr (cdr (list 1 2 3))) -- pair
+TR opt: pair.rkt 65:31 (cdr (list 1 2 3)) -- pair
+TR missed opt: pair.rkt 68:0 (mcar (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 68:6 (values (ann (mlist 1) (MListof Byte)))
+TR opt: pair.rkt 69:0 (mcar (mlist 1 2 3)) -- pair
+TR missed opt: pair.rkt 70:0 (mcdr (values (ann (mlist 1) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 70:6 (values (ann (mlist 1) (MListof Byte)))
+TR opt: pair.rkt 71:0 (mcdr (mlist 1 2 3)) -- pair
+TR opt: pair.rkt 72:0 (mcdr (mcdr (mlist 1 2 3))) -- pair
+TR opt: pair.rkt 72:6 (mcdr (mlist 1 2 3)) -- pair
+TR opt: pair.rkt 73:0 (mcdr (mcdr (mcdr (mlist 1 2 3)))) -- pair
+TR opt: pair.rkt 73:6 (mcdr (mcdr (mlist 1 2 3))) -- pair
+TR opt: pair.rkt 73:12 (mcdr (mlist 1 2 3)) -- pair
+TR missed opt: pair.rkt 74:0 (set-mcar! (values (ann (mlist 2) (MListof Byte))) 2) -- car/cdr on a potentially empty list -- caused by: 74:11 (values (ann (mlist 2) (MListof Byte)))
+TR opt: pair.rkt 75:0 (set-mcar! (mlist 2 3 4) 2) -- pair
+TR missed opt: pair.rkt 76:0 (set-mcdr! (values (ann (mlist 2) (MListof Byte))) (values (ann (mlist 2) (MListof Byte)))) -- car/cdr on a potentially empty list -- caused by: 76:11 (values (ann (mlist 2) (MListof Byte)))
+TR opt: pair.rkt 78:0 (mcar (mcons 2 3)) -- pair
+TR opt: pair.rkt 79:0 (mcdr (mcons 2 3)) -- pair
+TR opt: pair.rkt 80:0 (set-mcar! (mcons 2 3) 3) -- pair
+TR opt: pair.rkt 81:0 (set-mcdr! (mcons 2 3) 4) -- pair
+TR missed opt: pair.rkt 82:17 (mcar (quote ())) -- car/cdr on a potentially empty list -- caused by: 82:23 (quote ())
+TR missed opt: pair.rkt 83:17 (mcdr (quote ())) -- car/cdr on a potentially empty list -- caused by: 83:23 (quote ())
+TR missed opt: pair.rkt 84:17 (set-mcar! (quote ()) 2) -- car/cdr on a potentially empty list -- caused by: 84:28 (quote ())
+TR missed opt: pair.rkt 85:17 (set-mcdr! (ann (quote ()) (MListof Integer)) (ann (mlist 3) (MListof Integer))) -- car/cdr on a potentially empty list -- caused by: 85:33 (quote ())
 1
 1
 '(2 3)
@@ -47,7 +47,8 @@ TR missed opt: pair.rkt 84:17 (set-mcdr! (ann (quote ()) (MListof Integer)) (ann
 '()
 2
 3
-)
+
+END
 
 #lang typed/racket
 (require compatibility/mlist)
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 3ec8e63f..5a439629 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,30 +1,31 @@
 #;
-(
-TR info: precision-loss.rkt 36:3 (* 3/4 2/3) -- exact real arith
-TR missed opt: precision-loss.rkt 36:0 (+ (* 3/4 2/3) 2.0) -- exact ops inside float expr -- caused by: 36:3 (* 3/4 2/3)
-TR opt: precision-loss.rkt 36:0 (+ (* 3/4 2/3) 2.0) -- binary float
-TR opt: precision-loss.rkt 38:0 (+ 3/4 2.0) -- binary float
-TR info: precision-loss.rkt 40:3 (- 3/4) -- exact real arith
-TR missed opt: precision-loss.rkt 40:0 (+ (- 3/4) 2.0) -- exact ops inside float expr -- caused by: 40:3 (- 3/4)
-TR opt: precision-loss.rkt 40:0 (+ (- 3/4) 2.0) -- binary float
-TR info: precision-loss.rkt 42:39 (+ 1/4 3/4) -- exact real arith
-TR missed opt: precision-loss.rkt 42: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: 42:3 (vector-ref (quote #(2/3 1/2 3/4)) (assert (+ 1/4 3/4) exact-integer?))
-TR info: precision-loss.rkt 42:39 (+ 1/4 3/4) -- exact real arith
-TR missed opt: precision-loss.rkt 48:3 (* (r 3/4) 2/3) -- all args float-arg-expr, result not Float -- caused by: 48:6 (r 3/4), 48:14 2/3
-TR info: precision-loss.rkt 48:3 (* (r 3/4) 2/3) -- exact real arith
-TR opt: precision-loss.rkt 49:3 (car (list (* 2.0 (* (r 3/4) 2/3)))) -- pair
-TR missed opt: precision-loss.rkt 49:21 (* (r 3/4) 2/3) -- all args float-arg-expr, result not Float -- caused by: 49:24 (r 3/4), 49:32 2/3
-TR info: precision-loss.rkt 49:21 (* (r 3/4) 2/3) -- exact real arith
-TR missed opt: precision-loss.rkt 49:14 (* 2.0 (* (r 3/4) 2/3)) -- all args float-arg-expr, result not Float -- caused by: 49:21 (* (r 3/4) 2/3)
-TR info: precision-loss.rkt 49:14 (* 2.0 (* (r 3/4) 2/3)) -- exact real arith
-TR missed opt: precision-loss.rkt 48: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: 48:3 (* (r 3/4) 2/3), 49:3 (car (list (* 2.0 (* (r 3/4) 2/3))))
-TR info: precision-loss.rkt 48:0 (* (* (r 3/4) 2/3) (car (list (* 2.0 (* (r 3/4) 2/3)))) 2.0) -- exact real arith
+#<<END
+TR info: precision-loss.rkt 37:3 (* 3/4 2/3) -- exact real arith
+TR missed opt: precision-loss.rkt 37:0 (+ (* 3/4 2/3) 2.0) -- exact ops inside float expr -- caused by: 37:3 (* 3/4 2/3)
+TR opt: precision-loss.rkt 37:0 (+ (* 3/4 2/3) 2.0) -- binary float
+TR opt: precision-loss.rkt 39:0 (+ 3/4 2.0) -- binary float
+TR info: precision-loss.rkt 41:3 (- 3/4) -- exact real arith
+TR missed opt: precision-loss.rkt 41:0 (+ (- 3/4) 2.0) -- exact ops inside float expr -- caused by: 41:3 (- 3/4)
+TR opt: precision-loss.rkt 41:0 (+ (- 3/4) 2.0) -- binary float
+TR info: precision-loss.rkt 43:39 (+ 1/4 3/4) -- exact real arith
+TR missed opt: precision-loss.rkt 43:0 (+ (vector-ref (quote #(2/3 1/2 3/4)) (assert (+ 1/4 3/4) exact-integer?)) 2.0) -- all args float-arg-expr, result not Float -- caused by: 43:3 (vector-ref (quote #(2/3 1/2 3/4)) (assert (+ 1/4 3/4) exact-integer?))
+TR info: precision-loss.rkt 43:39 (+ 1/4 3/4) -- exact real arith
+TR missed opt: precision-loss.rkt 49:3 (* (r 3/4) 2/3) -- all args float-arg-expr, result not Float -- caused by: 49:6 (r 3/4), 49:14 2/3
+TR info: precision-loss.rkt 49:3 (* (r 3/4) 2/3) -- exact real arith
+TR opt: precision-loss.rkt 50:3 (car (list (* 2.0 (* (r 3/4) 2/3)))) -- pair
+TR missed opt: precision-loss.rkt 50:21 (* (r 3/4) 2/3) -- all args float-arg-expr, result not Float -- caused by: 50:24 (r 3/4), 50:32 2/3
+TR info: precision-loss.rkt 50:21 (* (r 3/4) 2/3) -- exact real arith
+TR missed opt: precision-loss.rkt 50:14 (* 2.0 (* (r 3/4) 2/3)) -- all args float-arg-expr, result not Float -- caused by: 50:21 (* (r 3/4) 2/3)
+TR info: precision-loss.rkt 50:14 (* 2.0 (* (r 3/4) 2/3)) -- exact real arith
+TR missed opt: precision-loss.rkt 49:0 (* (* (r 3/4) 2/3) (car (list (* 2.0 (* (r 3/4) 2/3)))) 2.0) -- all args float-arg-expr, result not Float -- caused by: 49:3 (* (r 3/4) 2/3), 50:3 (car (list (* 2.0 (* (r 3/4) 2/3))))
+TR info: precision-loss.rkt 49:0 (* (* (r 3/4) 2/3) (car (list (* 2.0 (* (r 3/4) 2/3)))) 2.0) -- exact real arith
 2.5
 2.75
 1.25
 2.5
 1.0
-)
+
+END
 
 
 #lang typed/racket
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 eaeaa5a3..600e2560 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,17 +1,21 @@
 #;
-(
-TR missed opt: real-in-float-expr.rkt 17:0 (* (ann 3 Real) 2.3) -- all args float-arg-expr, result not Float -- caused by: 17:8 3
-TR info: real-in-float-expr.rkt 17:0 (* (ann 3 Real) 2.3) -- exact real arith
-TR opt: real-in-float-expr.rkt 22:0 (* 2 3) -- fixnum bounded expr
-TR opt: real-in-float-expr.rkt 23:0 (+ 2 3) -- fixnum bounded expr
-TR info: real-in-float-expr.rkt 24:0 (+ 2/3 3/4) -- exact real arith
-TR missed opt: real-in-float-expr.rkt 26:0 (* (ann 2 Natural) 2.0) -- all args float-arg-expr, result not Float -- caused by: 26:8 2
-TR info: real-in-float-expr.rkt 26:0 (* (ann 2 Natural) 2.0) -- exact real arith
-6.8999999999999995 6 5 6
+#<<END
+TR missed opt: real-in-float-expr.rkt 21:0 (* (ann 3 Real) 2.3) -- all args float-arg-expr, result not Float -- caused by: 21:8 3
+TR info: real-in-float-expr.rkt 21:0 (* (ann 3 Real) 2.3) -- exact real arith
+TR opt: real-in-float-expr.rkt 26:0 (* 2 3) -- fixnum bounded expr
+TR opt: real-in-float-expr.rkt 27:0 (+ 2 3) -- fixnum bounded expr
+TR info: real-in-float-expr.rkt 28:0 (+ 2/3 3/4) -- exact real arith
+TR missed opt: real-in-float-expr.rkt 30:0 (* (ann 2 Natural) 2.0) -- all args float-arg-expr, result not Float -- caused by: 30:8 2
+TR info: real-in-float-expr.rkt 30:0 (* (ann 2 Natural) 2.0) -- exact real arith
+6.8999999999999995
+6
+5
+6
 5
 17/12
 4.0
-)
+
+END
 #lang typed/racket
 
 (* (ann 3 Real) ; with type Real, typechecker must assume it could be exact 0
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 1bee7d6d..c7323aec 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,13 +1,17 @@
 #;
-(
-TR missed opt: unary-float.rkt 14:0 (sin (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 14:10 3.4
-TR info: unary-float.rkt 14:0 (sin (ann 3.4 Real)) -- exact real arith
-TR missed opt: unary-float.rkt 15:0 (sin 3) -- all args float-arg-expr, result not Float -- caused by: 15:5 3
-TR info: unary-float.rkt 15:0 (sin 3) -- exact real arith
-TR missed opt: unary-float.rkt 16:0 (abs (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 16:10 3.4
-TR info: unary-float.rkt 16:0 (abs (ann 3.4 Real)) -- exact real arith
--0.2555411020268312 0.1411200080598672 3.4 3
-)
+#<<END
+TR missed opt: unary-float.rkt 18:0 (sin (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 18:10 3.4
+TR info: unary-float.rkt 18:0 (sin (ann 3.4 Real)) -- exact real arith
+TR missed opt: unary-float.rkt 19:0 (sin 3) -- all args float-arg-expr, result not Float -- caused by: 19:5 3
+TR info: unary-float.rkt 19:0 (sin 3) -- exact real arith
+TR missed opt: unary-float.rkt 20:0 (abs (ann 3.4 Real)) -- all args float-arg-expr, result not Float -- caused by: 20:10 3.4
+TR info: unary-float.rkt 20:0 (abs (ann 3.4 Real)) -- exact real arith
+-0.2555411020268312
+0.1411200080598672
+3.4
+3
+
+END
 
 #lang typed/racket
 
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 35e13be9..8e41c876 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,12 +1,13 @@
 #;
-(
-TR missed opt: unexpected-complex.rkt 15:0 (sqrt (ann 4 Integer)) -- unexpected complex type
-TR opt: unexpected-complex.rkt 16:3 1.2+3.4i -- unboxed literal
-TR opt: unexpected-complex.rkt 16:12 2.0 -- float-arg-expr in complex ops
-TR opt: unexpected-complex.rkt 16:0 (+ 1.2+3.4i 2.0) -- unboxed binary float complex
+#<<END
+TR missed opt: unexpected-complex.rkt 16:0 (sqrt (ann 4 Integer)) -- unexpected complex type
+TR opt: unexpected-complex.rkt 17:3 1.2+3.4i -- unboxed literal
+TR opt: unexpected-complex.rkt 17:12 2.0 -- float-arg-expr in complex ops
+TR opt: unexpected-complex.rkt 17:0 (+ 1.2+3.4i 2.0) -- unboxed binary float complex
 2
 3.2+3.4i
-)
+
+END
 
 #lang typed/racket
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt
index d829e243..71e3bbe7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt
@@ -25,7 +25,9 @@
        (with-input-from-file (build-path dir name)
          (lambda () ; from the test file
            (read-line) ; skip the #;
-           (read)))))))
+           (with-input-from-string (read) 
+              (lambda ()
+                (for/list ((v (in-port))) v)))))))))
 
 
 (define-runtime-path tests-dir                "./tests")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt
index 733a367d..56d328a6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/add1.rkt
@@ -1,14 +1,15 @@
 #;
-(
-TR opt: add1.rkt 14:5 (add1 5) -- fixnum add1
-TR opt: add1.rkt 15:5 (sub1 3) -- fixnum sub1
-TR opt: add1.rkt 16:5 (add1 2.3) -- float add1
-TR opt: add1.rkt 17:5 (sub1 2.25) -- float sub1
+#<<END
+TR opt: add1.rkt 15:5 (add1 5) -- fixnum add1
+TR opt: add1.rkt 16:5 (sub1 3) -- fixnum sub1
+TR opt: add1.rkt 17:5 (add1 2.3) -- float add1
+TR opt: add1.rkt 18:5 (sub1 2.25) -- float sub1
 6
 2
 3.3
 1.25
-)
+
+END
 
 #lang typed/racket #:optimize
 (ann (add1 5) Fixnum)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt
index ea5060ff..a858da89 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/annotations.rkt
@@ -1,10 +1,11 @@
 #;
-(
-TR opt: annotations.rkt 10:10 (+ 1.0 2.0) -- binary float
-TR opt: annotations.rkt 13:10 (+ 1.0 2.0) -- binary float
-TR opt: annotations.rkt 16:10 (+ 1.0 2.0) -- binary float
-TR opt: annotations.rkt 18:15 (+ 1.0 2.0) -- binary float
-)
+#<<END
+TR opt: annotations.rkt 11:10 (+ 1.0 2.0) -- binary float
+TR opt: annotations.rkt 14:10 (+ 1.0 2.0) -- binary float
+TR opt: annotations.rkt 17:10 (+ 1.0 2.0) -- binary float
+TR opt: annotations.rkt 19:15 (+ 1.0 2.0) -- binary float
+
+END
 #lang typed/racket #:optimize
 
 (define a (+ 1.0 2.0))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt
index 171d63db..71454679 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/apply-plus.rkt
@@ -1,10 +1,11 @@
 #;
-(
-TR opt: apply-plus.rkt 12:0 (apply + (map add1 (list 1 2 3))) -- apply-map
-TR opt: apply-plus.rkt 13:0 (apply * (map add1 (list 1 2 3))) -- apply-map
+#<<END
+TR opt: apply-plus.rkt 13:0 (apply + (map add1 (list 1 2 3))) -- apply-map
+TR opt: apply-plus.rkt 14:0 (apply * (map add1 (list 1 2 3))) -- apply-map
 9
 24
-)
+
+END
 
 #lang typed/racket
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt
index 80867f20..7b0c399d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/begin-float.rkt
@@ -1,10 +1,11 @@
 #;
-(
-TR opt: begin-float.rkt 12:7 (- 2.0 3.0) -- binary float
-TR opt: begin-float.rkt 13:7 (* 2.0 3.0) -- binary float
+#<<END
+TR opt: begin-float.rkt 13:7 (- 2.0 3.0) -- binary float
+TR opt: begin-float.rkt 14:7 (* 2.0 3.0) -- binary float
 -1.0
 6.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt
index 6588e548..cf44af36 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-fixnum.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: binary-fixnum.rkt 12:15 (vector-length v) -- vector-length
-TR opt: binary-fixnum.rkt 12:2 (bitwise-and (vector-length v) 1) -- binary fixnum
-)
+#<<END
+TR opt: binary-fixnum.rkt 13:15 (vector-length v) -- vector-length
+TR opt: binary-fixnum.rkt 13:2 (bitwise-and (vector-length v) 1) -- binary fixnum
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-nonzero-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/binary-nonzero-fixnum.rkt
index 5625ae06..446cc1a1 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,9 +1,10 @@
 #;
-(
-TR opt: binary-nonzero-fixnum.rkt 11:8 (vector-length (quote #(1 2 3))) -- known-length vector-length
-TR opt: binary-nonzero-fixnum.rkt 11:0 (modulo (vector-length (quote #(1 2 3))) 2) -- binary nonzero fixnum
+#<<END
+TR opt: binary-nonzero-fixnum.rkt 12:8 (vector-length (quote #(1 2 3))) -- known-length vector-length
+TR opt: binary-nonzero-fixnum.rkt 12:0 (modulo (vector-length (quote #(1 2 3))) 2) -- binary nonzero fixnum
 1
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 0e91f99a..c3f27e8a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/bounds-check.rkt
@@ -1,20 +1,27 @@
 #;
-(
-TR opt: bounds-check.rkt 25:2 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 28:2 (vector-set! v i n) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 31:2 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: bounds-check.rkt 34:2 (vector-set! v i n) -- vector partial bounds checking elimination
-TR info: bounds-check.rkt 37:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 39:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 41:1 displayln -- hidden parameter
-TR opt: bounds-check.rkt 46:2 (flvector-ref v i) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 49:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 52:2 (flvector-ref v i) -- flvector partial bounds checking elimination
-TR opt: bounds-check.rkt 55:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
-TR info: bounds-check.rkt 58:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 60:1 displayln -- hidden parameter
-TR info: bounds-check.rkt 62:1 displayln -- hidden parameter
-3 4 5 3.0 4.0 5.0)
+#<<END
+TR opt: bounds-check.rkt 32:2 (vector-ref v i) -- vector partial bounds checking elimination
+TR opt: bounds-check.rkt 35:2 (vector-set! v i n) -- vector partial bounds checking elimination
+TR opt: bounds-check.rkt 38:2 (vector-ref v i) -- vector partial bounds checking elimination
+TR opt: bounds-check.rkt 41:2 (vector-set! v i n) -- vector partial bounds checking elimination
+TR info: bounds-check.rkt 44:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 46:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 48:1 displayln -- hidden parameter
+TR opt: bounds-check.rkt 53:2 (flvector-ref v i) -- flvector partial bounds checking elimination
+TR opt: bounds-check.rkt 56:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
+TR opt: bounds-check.rkt 59:2 (flvector-ref v i) -- flvector partial bounds checking elimination
+TR opt: bounds-check.rkt 62:2 (flvector-set! v i n) -- flvector partial bounds checking elimination
+TR info: bounds-check.rkt 65:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 67:1 displayln -- hidden parameter
+TR info: bounds-check.rkt 69:1 displayln -- hidden parameter
+3
+4
+5
+3.0
+4.0
+5.0
+
+END
 
 #lang typed/racket
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt
index fbb76f78..d734ffc3 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/box.rkt
@@ -1,11 +1,12 @@
 #;
-(
-TR opt: box.rkt 17:0 (unbox x) -- box
-TR opt: box.rkt 18:0 (set-box! x 2) -- box
-TR opt: box.rkt 19:0 (unbox x) -- box
+#<<END
+TR opt: box.rkt 18:0 (unbox x) -- box
+TR opt: box.rkt 19:0 (set-box! x 2) -- box
+TR opt: box.rkt 20:0 (unbox x) -- box
 1
 2
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 396774fb..febddad5 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-arrow.rkt
@@ -1,14 +1,15 @@
 #;
-(
-TR missed opt: case-arrow.rkt 41:15 (- max min) -- all args float-arg-expr, result not Float -- caused by: 41:18 max, 41:22 min
-TR info: case-arrow.rkt 41:15 (- max min) -- exact real arith
-TR missed opt: case-arrow.rkt 41:12 (* (- max min) x) -- all args float-arg-expr, result not Float -- caused by: 41:15 (- max min), 41:27 x
-TR info: case-arrow.rkt 41:12 (* (- max min) x) -- exact real arith
-TR missed opt: case-arrow.rkt 41:9 (/ (* (- max min) x) p) -- all args float-arg-expr, result not Float -- caused by: 41:12 (* (- max min) x), 41:30 p
-TR info: case-arrow.rkt 41:9 (/ (* (- max min) x) p) -- exact real arith
-TR missed opt: case-arrow.rkt 41:2 (+ min (/ (* (- max min) x) p)) -- all args float-arg-expr, result not Float -- caused by: 41:5 min, 41:9 (/ (* (- max min) x) p)
-TR info: case-arrow.rkt 41:2 (+ min (/ (* (- max min) x) p)) -- exact real arith
-)
+#<<END
+TR missed opt: case-arrow.rkt 42:15 (- max min) -- all args float-arg-expr, result not Float -- caused by: 42:18 max, 42:22 min
+TR info: case-arrow.rkt 42:15 (- max min) -- exact real arith
+TR missed opt: case-arrow.rkt 42:12 (* (- max min) x) -- all args float-arg-expr, result not Float -- caused by: 42:15 (- max min), 42:27 x
+TR info: case-arrow.rkt 42:12 (* (- max min) x) -- exact real arith
+TR missed opt: case-arrow.rkt 42:9 (/ (* (- max min) x) p) -- all args float-arg-expr, result not Float -- caused by: 42:12 (* (- max min) x), 42:30 p
+TR info: case-arrow.rkt 42:9 (/ (* (- max min) x) p) -- exact real arith
+TR missed opt: case-arrow.rkt 42:2 (+ min (/ (* (- max min) x) p)) -- all args float-arg-expr, result not Float -- caused by: 42:5 min, 42:9 (/ (* (- max min) x) p)
+TR info: case-arrow.rkt 42:2 (+ min (/ (* (- max min) x) p)) -- exact real arith
+
+END
 #lang typed/racket
 
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt
index e64dc39b..b531bb34 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/case-lambda-dead-branch.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: case-lambda-dead-branch.rkt 12:5 (x y) -- dead case-lambda branch
-TR opt: case-lambda-dead-branch.rkt 18:5 (x y) -- dead case-lambda branch
-)
+#<<END
+TR opt: case-lambda-dead-branch.rkt 13:5 (x y) -- dead case-lambda branch
+TR opt: case-lambda-dead-branch.rkt 19:5 (x y) -- dead case-lambda branch
+
+END
 #lang typed/racket
 
 (: f (case-> (Symbol Symbol -> String)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/complex-exp.rkt
index 8b24fef9..1d8cdbe6 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,11 +1,12 @@
 #;
-(
-TR opt: complex-exp.rkt 12:8 0 -- float-arg-expr in complex ops
-TR opt: complex-exp.rkt 12:3 (exp 0) -- unboxed unary float complex
-TR opt: complex-exp.rkt 12:11 1.0+2.0i -- unboxed literal
-TR opt: complex-exp.rkt 12:0 (- (exp 0) 1.0+2.0i) -- unboxed binary float complex
+#<<END
+TR opt: complex-exp.rkt 13:8 0 -- float-arg-expr in complex ops
+TR opt: complex-exp.rkt 13:3 (exp 0) -- unboxed unary float complex
+TR opt: complex-exp.rkt 13:11 1.0+2.0i -- unboxed literal
+TR opt: complex-exp.rkt 13:0 (- (exp 0) 1.0+2.0i) -- unboxed binary float complex
 0.0-2.0i
-)
+
+END
 
 #lang typed/racket
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt
index c9159bba..599ffd04 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct.rkt
@@ -1,6 +1,7 @@
 #;
-(
-)
+#<<END
+
+END
 
 #lang typed/scheme #:optimize
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt
index b74cf571..9b4514d7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/cross-module-struct2.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: cross-module-struct2.rkt 11:0 (x-x a) -- struct ref
+#<<END
+TR opt: cross-module-struct2.rkt 12:0 (x-x a) -- struct ref
 1
-)
+
+END
 
 #lang typed/scheme #:optimize
 
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 de1de1d7..fa0c601a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-else.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-else.rkt
@@ -1,12 +1,13 @@
 #;
-(
-TR info: dead-else.rkt 12:1 display -- hidden parameter
-TR opt: dead-else.rkt 14:13 (+ 4.0 5.0) -- dead else branch
-TR opt: dead-else.rkt 13:13 (+ 2.0 3.0) -- binary float
-TR info: dead-else.rkt 15:1 display -- hidden parameter
-TR opt: dead-else.rkt 17:13 (+ 4.0 5.0) -- dead else branch
-TR opt: dead-else.rkt 16:13 (+ 2.0 3.0) -- binary float
-5.05.0)
+#<<END
+TR info: dead-else.rkt 13:1 display -- hidden parameter
+TR opt: dead-else.rkt 15:13 (+ 4.0 5.0) -- dead else branch
+TR opt: dead-else.rkt 14:13 (+ 2.0 3.0) -- binary float
+TR info: dead-else.rkt 16:1 display -- hidden parameter
+TR opt: dead-else.rkt 18:13 (+ 4.0 5.0) -- dead else branch
+TR opt: dead-else.rkt 17:13 (+ 2.0 3.0) -- binary float
+5.05.0
+END
 #lang typed/scheme
 #:optimize
 (display (if (number? 3)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt
index 34654f42..443ba07d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-inf-comp.rkt
@@ -1,65 +1,65 @@
 #;
-(
-TR opt: dead-inf-comp.rkt 105:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 107:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 110:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 114:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 118:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 120:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 123:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 127:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 131:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 133:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 136:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 140:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 144:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 146:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 149:4 (quote dead) -- dead then branch
-TR opt: dead-inf-comp.rkt 153:4 (quote dead) -- dead else branch
-TR opt: dead-inf-comp.rkt 158:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 156:4 (< rat +inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 160:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 159:4 (< +inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 163:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 162:4 (< rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 167:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 165:4 (< -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 171:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 169:4 (> +inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 173:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 172:4 (> rat +inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 176:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 175:4 (> -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 180:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 178:4 (> rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 184:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 182:4 (<= rat +inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 186:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 185:4 (<= +inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 189:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 188:4 (<= rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 193:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 191:4 (<= -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 197:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 195:4 (>= +inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 199:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 198:4 (>= rat +inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 202:4 (quote dead) -- dead then branch
-TR info: dead-inf-comp.rkt 201:4 (>= -inf.f rat) -- exact real arith
-TR opt: dead-inf-comp.rkt 206:4 (quote dead) -- dead else branch
-TR info: dead-inf-comp.rkt 204:4 (>= rat -inf.f) -- exact real arith
-TR opt: dead-inf-comp.rkt 99:0 #%module-begin -- in-range
-TR opt: dead-inf-comp.rkt 99:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 99:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 99:0 #%module-begin -- dead else branch
-TR opt: dead-inf-comp.rkt 209:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 209:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR info: dead-inf-comp.rkt 209:41 displayln -- hidden parameter
-TR opt: dead-inf-comp.rkt 209:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 209:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR opt: dead-inf-comp.rkt 209:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
-TR info: dead-inf-comp.rkt 209:41 displayln -- hidden parameter
-TR opt: dead-inf-comp.rkt 209:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+#<<END
+TR opt: dead-inf-comp.rkt 106:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 108:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 111:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 115:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 119:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 121:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 124:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 128:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 132:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 134:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 137:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 141:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 145:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 147:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 150:4 (quote dead) -- dead then branch
+TR opt: dead-inf-comp.rkt 154:4 (quote dead) -- dead else branch
+TR opt: dead-inf-comp.rkt 159:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 157:4 (< rat +inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 161:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 160:4 (< +inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 164:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 163:4 (< rat -inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 168:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 166:4 (< -inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 172:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 170:4 (> +inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 174:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 173:4 (> rat +inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 177:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 176:4 (> -inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 181:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 179:4 (> rat -inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 185:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 183:4 (<= rat +inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 187:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 186:4 (<= +inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 190:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 189:4 (<= rat -inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 194:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 192:4 (<= -inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 198:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 196:4 (>= +inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 200:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 199:4 (>= rat +inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 203:4 (quote dead) -- dead then branch
+TR info: dead-inf-comp.rkt 202:4 (>= -inf.f rat) -- exact real arith
+TR opt: dead-inf-comp.rkt 207:4 (quote dead) -- dead else branch
+TR info: dead-inf-comp.rkt 205:4 (>= rat -inf.f) -- exact real arith
+TR opt: dead-inf-comp.rkt 100:0 #%module-begin -- in-range
+TR opt: dead-inf-comp.rkt 100:0 #%module-begin -- dead else branch
+TR opt: dead-inf-comp.rkt 100:0 #%module-begin -- dead else branch
+TR opt: dead-inf-comp.rkt 100:0 #%module-begin -- dead else branch
+TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR info: dead-inf-comp.rkt 210:41 displayln -- hidden parameter
+TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
+TR info: dead-inf-comp.rkt 210:41 displayln -- hidden parameter
+TR opt: dead-inf-comp.rkt 210:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (displayln i)) -- dead else branch
 'live
 'live
 'live
@@ -95,7 +95,8 @@ TR opt: dead-inf-comp.rkt 209:0 (for: ((i (in-range 5 +inf.0 2)) (j 3)) (display
 5
 7
 9
-)
+
+END
 #lang typed/racket/base
 
 (define: rat : Exact-Rational 2/3)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt
index 8eab2ebf..096f4cae 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-substructs.rkt
@@ -1,8 +1,11 @@
 #;
-(
-TR info: dead-substructs.rkt 23:4 make-child1 -- struct constructor
-TR info: dead-substructs.rkt 24:4 make-child2 -- struct constructor
-1 2)
+#<<END
+TR info: dead-substructs.rkt 26:4 make-child1 -- struct constructor
+TR info: dead-substructs.rkt 27:4 make-child2 -- struct constructor
+1
+2
+
+END
 
 #lang typed/scheme
 #:optimize
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 c5c48481..a1fae219 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-then.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/dead-then.rkt
@@ -1,12 +1,13 @@
 #;
-(
-TR info: dead-then.rkt 12:1 display -- hidden parameter
-TR opt: dead-then.rkt 13:13 (+ 2.0 3.0) -- dead then branch
-TR opt: dead-then.rkt 14:13 (+ 4.0 5.0) -- binary float
-TR info: dead-then.rkt 15:1 display -- hidden parameter
-TR opt: dead-then.rkt 16:13 (+ 2.0 3.0) -- dead then branch
-TR opt: dead-then.rkt 17:13 (+ 4.0 5.0) -- binary float
-9.09.0)
+#<<END
+TR info: dead-then.rkt 13:1 display -- hidden parameter
+TR opt: dead-then.rkt 14:13 (+ 2.0 3.0) -- dead then branch
+TR opt: dead-then.rkt 15:13 (+ 4.0 5.0) -- binary float
+TR info: dead-then.rkt 16:1 display -- hidden parameter
+TR opt: dead-then.rkt 17:13 (+ 2.0 3.0) -- dead then branch
+TR opt: dead-then.rkt 18:13 (+ 4.0 5.0) -- binary float
+9.09.0
+END
 #lang typed/scheme
 #:optimize
 (display (if (number? "eh")
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt
index 6ba13ce4..718ff04a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-begin-float.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR info: define-begin-float.rkt 10:18 display -- hidden parameter
-TR opt: define-begin-float.rkt 10:26 (- 2.0 3.0) -- binary float
-TR opt: define-begin-float.rkt 11:17 (* 2.0 3.0) -- binary float
--1.0)
+#<<END
+TR info: define-begin-float.rkt 11:18 display -- hidden parameter
+TR opt: define-begin-float.rkt 11:26 (- 2.0 3.0) -- binary float
+TR opt: define-begin-float.rkt 12:17 (* 2.0 3.0) -- binary float
+-1.0
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt
index cb235a66..eea23593 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-call-float.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: define-call-float.rkt 9:16 (+ 1.0 2.0) -- binary float
-)
+#<<END
+TR opt: define-call-float.rkt 10:16 (+ 1.0 2.0) -- binary float
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt
index 9e343ae9..48726eba 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-float.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: define-float.rkt 9:10 (+ 1.0 2.0) -- binary float
-)
+#<<END
+TR opt: define-float.rkt 10:10 (+ 1.0 2.0) -- binary float
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt
index 4dc34ef7..c4dd140e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/define-pair.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: define-pair.rkt 9:10 (car (quote (1 3))) -- pair
-)
+#<<END
+TR opt: define-pair.rkt 10:10 (car (quote (1 3))) -- pair
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt
index ea866049..2084d2f2 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair.rkt
@@ -1,22 +1,19 @@
 #;
-(
-TR opt: derived-pair.rkt 23:0 (caar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 23:0 (caar (cons (cons 1 2) 3)) -- pair
-
-TR opt: derived-pair.rkt 24:0 (cadr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 24:0 (cadr (cons 1 (cons 2 3))) -- pair
-
-TR opt: derived-pair.rkt 25:0 (cdar (cons (cons 1 2) 3)) -- pair
-TR opt: derived-pair.rkt 25:0 (cdar (cons (cons 1 2) 3)) -- pair
-
-TR opt: derived-pair.rkt 26:0 (cddr (cons 1 (cons 2 3))) -- pair
-TR opt: derived-pair.rkt 26:0 (cddr (cons 1 (cons 2 3))) -- pair
-
+#<<END
+TR opt: derived-pair.rkt 20:0 (caar (cons (cons 1 2) 3)) -- pair
+TR opt: derived-pair.rkt 20:0 (caar (cons (cons 1 2) 3)) -- pair
+TR opt: derived-pair.rkt 21:0 (cadr (cons 1 (cons 2 3))) -- pair
+TR opt: derived-pair.rkt 21:0 (cadr (cons 1 (cons 2 3))) -- pair
+TR opt: derived-pair.rkt 22:0 (cdar (cons (cons 1 2) 3)) -- pair
+TR opt: derived-pair.rkt 22:0 (cdar (cons (cons 1 2) 3)) -- pair
+TR opt: derived-pair.rkt 23:0 (cddr (cons 1 (cons 2 3))) -- pair
+TR opt: derived-pair.rkt 23:0 (cddr (cons 1 (cons 2 3))) -- pair
 1
 2
 2
 3
-)
+
+END
 
 #lang typed/racket #:optimize
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt
index 62e1419c..2f84e6ac 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/derived-pair2.rkt
@@ -1,37 +1,29 @@
 #;
-(
-TR opt: derived-pair2.rkt 47:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 47:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 47:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
-
-TR opt: derived-pair2.rkt 48:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 48:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 48:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
-
-TR opt: derived-pair2.rkt 49:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 49:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 49:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
-
-TR opt: derived-pair2.rkt 50:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 50:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 50:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-
-TR opt: derived-pair2.rkt 51:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 51:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-TR opt: derived-pair2.rkt 51:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
-
-TR opt: derived-pair2.rkt 52:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 52:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-TR opt: derived-pair2.rkt 52:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
-
-TR opt: derived-pair2.rkt 53:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 53:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-TR opt: derived-pair2.rkt 53:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
-
-TR opt: derived-pair2.rkt 54:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 54:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-TR opt: derived-pair2.rkt 54:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
-
+#<<END
+TR opt: derived-pair2.rkt 40:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 40:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 40:0 (caaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 41:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 41:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 41:0 (caadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 42:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 42:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 42:0 (cadar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 43:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
+TR opt: derived-pair2.rkt 43:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
+TR opt: derived-pair2.rkt 43:0 (caddr (cons 1 (cons 2 (cons 3 4)))) -- pair
+TR opt: derived-pair2.rkt 44:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 44:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 44:0 (cdaar (cons (cons (cons 1 2) 3) 4)) -- pair
+TR opt: derived-pair2.rkt 45:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 45:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 45:0 (cdadr (cons 1 (cons (cons 2 3) 4))) -- pair
+TR opt: derived-pair2.rkt 46:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 46:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 46:0 (cddar (cons (cons 1 (cons 2 3)) 4)) -- pair
+TR opt: derived-pair2.rkt 47:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
+TR opt: derived-pair2.rkt 47:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
+TR opt: derived-pair2.rkt 47:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
 1
 2
 2
@@ -40,7 +32,8 @@ TR opt: derived-pair2.rkt 54:0 (cdddr (cons 1 (cons 2 (cons 3 4)))) -- pair
 3
 3
 4
-)
+
+END
 
 #lang typed/racket #:optimize
 
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 ebe02ad3..a31692af 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,85 +1,69 @@
 #;
-(
-TR opt: derived-pair3.rkt 103:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 103:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 103:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 103:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-
-TR opt: derived-pair3.rkt 104:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 104:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 104:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 104:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-
-TR opt: derived-pair3.rkt 105:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 105:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 105:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 105:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-
-TR opt: derived-pair3.rkt 106:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 106:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 106:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 106:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-
-TR opt: derived-pair3.rkt 107:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 107:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 107:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 107:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-
-TR opt: derived-pair3.rkt 108:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 108:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 108:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 108:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-
-TR opt: derived-pair3.rkt 109:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 109:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 109:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 109:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-
-TR opt: derived-pair3.rkt 110:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 110:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 110:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 110:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-
-TR opt: derived-pair3.rkt 111:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 111:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 111:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 111:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
-
-TR opt: derived-pair3.rkt 112:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 112:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 112:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-TR opt: derived-pair3.rkt 112:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
-
-TR opt: derived-pair3.rkt 113:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 113:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 113:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-TR opt: derived-pair3.rkt 113:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
-
-TR opt: derived-pair3.rkt 114:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 114:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 114:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-TR opt: derived-pair3.rkt 114:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
-
-TR opt: derived-pair3.rkt 115:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 115:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 115:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-TR opt: derived-pair3.rkt 115:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
-
-TR opt: derived-pair3.rkt 116:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 116:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 116:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-TR opt: derived-pair3.rkt 116:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
-
-TR opt: derived-pair3.rkt 117:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 117:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 117:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-TR opt: derived-pair3.rkt 117:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
-
-TR opt: derived-pair3.rkt 118:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 118:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 118:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-TR opt: derived-pair3.rkt 118:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
-
+#<<END
+TR opt: derived-pair3.rkt 88:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 88:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 88:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 88:0 (caaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 89:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 89:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 89:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 89:0 (caaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 90:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 90:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 90:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 90:0 (caadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 91:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 91:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 91:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 91:0 (caaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 92:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 92:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 92:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 92:0 (cadaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 93:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 93:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 93:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 93:0 (cadadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 94:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 94:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 94:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 94:0 (caddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 95:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 95:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 95:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 95:0 (cadddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 96:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 96:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 96:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 96:0 (cdaaar (cons (cons (cons (cons 1 2) 3) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 97:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 97:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 97:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 97:0 (cdaadr (cons 1 (cons (cons (cons 2 3) 4) 5))) -- pair
+TR opt: derived-pair3.rkt 98:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 98:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 98:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 98:0 (cdadar (cons (cons 1 (cons (cons 2 3) 4)) 5)) -- pair
+TR opt: derived-pair3.rkt 99:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 99:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 99:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 99:0 (cdaddr (cons 1 (cons 2 (cons (cons 3 4) 5)))) -- pair
+TR opt: derived-pair3.rkt 100:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 100:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 100:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 100:0 (cddaar (cons (cons (cons 1 (cons 2 3)) 4) 5)) -- pair
+TR opt: derived-pair3.rkt 101:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 101:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 101:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 101:0 (cddadr (cons 1 (cons (cons 2 (cons 3 4)) 5))) -- pair
+TR opt: derived-pair3.rkt 102:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 102:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 102:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 102:0 (cdddar (cons (cons 1 (cons 2 (cons 3 4))) 5)) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
+TR opt: derived-pair3.rkt 103:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -- pair
 1
 2
 2
@@ -96,7 +80,8 @@ TR opt: derived-pair3.rkt 118:0 (cddddr (cons 1 (cons 2 (cons 3 (cons 4 5))))) -
 4
 4
 5
-)
+
+END
 
 #lang typed/racket #:optimize
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt
index ecba7b26..37be435b 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/different-langs.rkt
@@ -1,7 +1,9 @@
 #;
-(
-TR info: different-langs.rkt 10:0 (/ 1 2) -- exact real arith
-1/2)
+#<<END
+TR info: different-langs.rkt 12:0 (/ 1 2) -- exact real arith
+1/2
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt
index 3a218c6d..57657baa 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/double-float.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: double-float.rkt 10:0 (+ 2.0 2.0 2.0) -- binary float
+#<<END
+TR opt: double-float.rkt 11:0 (+ 2.0 2.0 2.0) -- binary float
 6.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 f95950d8..1625c4af 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,9 +1,10 @@
 #;
-(
-TR opt: drop-pure-pred.rkt 15:6 (list 2) -- dead else branch
-TR opt: drop-pure-pred.rkt 13:6 (exact-integer? x) -- useless pure code
+#<<END
+TR opt: drop-pure-pred.rkt 16:6 (list 2) -- dead else branch
+TR opt: drop-pure-pred.rkt 14:6 (exact-integer? x) -- useless pure code
 '(1)
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 5fc0cb2a..620e8e6b 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,20 +1,21 @@
 #;
-(
-TR opt: exact-inexact.rkt 22:0 (exact->inexact (expt 10 100)) -- int to float
-TR opt: exact-inexact.rkt 23:7 (exact->inexact (expt 2.3 3.2)) -- float to float
-TR opt: exact-inexact.rkt 23:0 (round (exact->inexact (expt 2.3 3.2))) -- unary float
-TR opt: exact-inexact.rkt 24:0 (real->double-flonum (expt 10 100)) -- int to float
-TR opt: exact-inexact.rkt 25:7 (real->double-flonum (expt 2.3 3.2)) -- float to float
-TR opt: exact-inexact.rkt 25:0 (round (real->double-flonum (expt 2.3 3.2))) -- unary float
-TR opt: exact-inexact.rkt 28:0 (exact->inexact (expt 1.0f0 2.0f0)) -- single-float to single-float
-TR opt: exact-inexact.rkt 29:0 (real->single-flonum (expt 1.0f0 2.0f0)) -- single-float to single-float
+#<<END
+TR opt: exact-inexact.rkt 23:0 (exact->inexact (expt 10 100)) -- int to float
+TR opt: exact-inexact.rkt 24:7 (exact->inexact (expt 2.3 3.2)) -- float to float
+TR opt: exact-inexact.rkt 24:0 (round (exact->inexact (expt 2.3 3.2))) -- unary float
+TR opt: exact-inexact.rkt 25:0 (real->double-flonum (expt 10 100)) -- int to float
+TR opt: exact-inexact.rkt 26:7 (real->double-flonum (expt 2.3 3.2)) -- float to float
+TR opt: exact-inexact.rkt 26:0 (round (real->double-flonum (expt 2.3 3.2))) -- unary float
+TR opt: exact-inexact.rkt 29:0 (exact->inexact (expt 1.0f0 2.0f0)) -- single-float to single-float
+TR opt: exact-inexact.rkt 30:0 (real->single-flonum (expt 1.0f0 2.0f0)) -- single-float to single-float
 1e+100
 14.0
 1e+100
 14.0
 1.0f0
 1.0f0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt
index 1cf3b12f..2f818ee6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/expt.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR missed opt: expt.rkt 13:13 (expt (sin 0.25) 1.0) -- unexpected complex type
-TR opt: expt.rkt 13:19 (sin 0.25) -- unary float
-)
+#<<END
+TR missed opt: expt.rkt 14:13 (expt (sin 0.25) 1.0) -- unexpected complex type
+TR opt: expt.rkt 14:19 (sin 0.25) -- unary float
+
+END
 
 #lang typed/racket
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt
index 745d0ea1..3f459ab7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/false-huh-dead-code.rkt
@@ -1,10 +1,11 @@
 #;
-(
-TR opt: false-huh-dead-code.rkt 10:16 1 -- dead then branch
-TR opt: false-huh-dead-code.rkt 11:13 1 -- dead then branch
+#<<END
+TR opt: false-huh-dead-code.rkt 11:16 1 -- dead then branch
+TR opt: false-huh-dead-code.rkt 12:13 1 -- dead then branch
 2
 2
-)
+
+END
 
 #lang typed/racket
 (if (false? #t) 1 2)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-bounded-expr.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fixnum-bounded-expr.rkt
index 271d8f81..cd897263 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 @@
 #;
-(
-TR opt: fixnum-bounded-expr.rkt 69:2 (+ x (sqr y)) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 75:7 (* y y) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 75:2 (- x (* y y)) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 82:2 (+ x y) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 85:2 (+ x y) -- fixnum bounded expr
-TR missed opt: fixnum-bounded-expr.rkt 88:2 (+ x y) -- out of fixnum range
-TR opt: fixnum-bounded-expr.rkt 90:0 (abs 45) -- fixnum fxabs
-TR opt: fixnum-bounded-expr.rkt 93:0 (fx+ 5 2) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 94:5 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 94:16 (* 24 25) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 94:0 (fx+ (+ 34 231) (* 24 25)) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 95:8 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 95:5 (+ (+ 34 231) 23) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 95:0 (fx+ (+ (+ 34 231) 23) -4) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 96:11 (+ 34 231) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 96:8 (+ (+ 34 231) 23) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 96:0 (fx+ -4 (+ (+ 34 231) 23)) -- fixnum fx+
-TR opt: fixnum-bounded-expr.rkt 97:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 97:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 97:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 97:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 99:5 (+ 300 301) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 99:17 (+ 301 302) -- fixnum bounded expr
-TR opt: fixnum-bounded-expr.rkt 99:0 (fx- (+ 300 301) (+ 301 302)) -- fixnum fx-
-TR opt: fixnum-bounded-expr.rkt 102:0 (fx* 4 5) -- fixnum fx*
-TR opt: fixnum-bounded-expr.rkt 105:0 (fxquotient (ann 34 Nonnegative-Fixnum) (ann -4 Negative-Fixnum)) -- fixnum fxquotient
-TR opt: fixnum-bounded-expr.rkt 108:0 (fxabs (ann 64235 Nonnegative-Fixnum)) -- fixnum fxabs
+#<<END
+TR opt: fixnum-bounded-expr.rkt 70:2 (+ x (sqr y)) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 76:7 (* y y) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 76:2 (- x (* y y)) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 83:2 (+ x y) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 86:2 (+ x y) -- fixnum bounded expr
+TR missed opt: fixnum-bounded-expr.rkt 89:2 (+ x y) -- out of fixnum range
+TR opt: fixnum-bounded-expr.rkt 91:0 (abs 45) -- fixnum fxabs
+TR opt: fixnum-bounded-expr.rkt 94:0 (fx+ 5 2) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 95:5 (+ 34 231) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 95:16 (* 24 25) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 95:0 (fx+ (+ 34 231) (* 24 25)) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 96:8 (+ 34 231) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 96:5 (+ (+ 34 231) 23) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 96:0 (fx+ (+ (+ 34 231) 23) -4) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 97:11 (+ 34 231) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 97:8 (+ (+ 34 231) 23) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 97:0 (fx+ -4 (+ (+ 34 231) 23)) -- fixnum fx+
+TR opt: fixnum-bounded-expr.rkt 98:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 98:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 98:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 98:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 100:5 (+ 300 301) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 100:17 (+ 301 302) -- fixnum bounded expr
+TR opt: fixnum-bounded-expr.rkt 100:0 (fx- (+ 300 301) (+ 301 302)) -- fixnum fx-
+TR opt: fixnum-bounded-expr.rkt 103:0 (fx* 4 5) -- fixnum fx*
+TR opt: fixnum-bounded-expr.rkt 106:0 (fxquotient (ann 34 Nonnegative-Fixnum) (ann -4 Negative-Fixnum)) -- fixnum fxquotient
+TR opt: fixnum-bounded-expr.rkt 109:0 (fxabs (ann 64235 Nonnegative-Fixnum)) -- fixnum fxabs
 28
 89525
 28
@@ -49,7 +49,8 @@ TR opt: fixnum-bounded-expr.rkt 108:0 (fxabs (ann 64235 Nonnegative-Fixnum)) --
 0
 64235
 4
-)
+
+END
 
 
 
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 10be51a9..23ad3687 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,10 +1,11 @@
 #;
-(
-TR opt: fixnum-comparison.rkt 12:3 (vector-length (quote #(1 2 3))) -- known-length vector-length
-TR opt: fixnum-comparison.rkt 12:29 (string-length "asdf") -- string-length
-TR opt: fixnum-comparison.rkt 12:0 (< (vector-length (quote #(1 2 3))) (string-length "asdf")) -- binary fixnum comp
+#<<END
+TR opt: fixnum-comparison.rkt 13:3 (vector-length (quote #(1 2 3))) -- known-length vector-length
+TR opt: fixnum-comparison.rkt 13:29 (string-length "asdf") -- string-length
+TR opt: fixnum-comparison.rkt 13:0 (< (vector-length (quote #(1 2 3))) (string-length "asdf")) -- binary fixnum comp
 #t
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt
index db4ffa8a..5818e4da 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-comp.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: float-comp.rkt 10:0 (< 1.0 2.0) -- binary float comp
+#<<END
+TR opt: float-comp.rkt 11:0 (< 1.0 2.0) -- binary float comp
 #t
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 3f71075a..305e859d 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,11 +1,12 @@
 #;
-(
-TR opt: float-complex-conjugate-top.rkt 13:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-conjugate-top.rkt 13:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-conjugate-top.rkt 13:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-conjugate-top.rkt 13:0 (conjugate (+ 1.0+2.0i 2.0+4.0i)) -- unboxed unary float complex
+#<<END
+TR opt: float-complex-conjugate-top.rkt 14:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-conjugate-top.rkt 14:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-conjugate-top.rkt 14:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-conjugate-top.rkt 14:0 (conjugate (+ 1.0+2.0i 2.0+4.0i)) -- unboxed unary float complex
 3.0-6.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 fd1ce816..f8decdac 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,12 +1,13 @@
 #;
-(
-TR opt: float-complex-conjugate.rkt 14:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-conjugate.rkt 14:3 (conjugate 1.0+2.0i) -- unboxed unary float complex
-TR opt: float-complex-conjugate.rkt 14:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-conjugate.rkt 14:24 (conjugate 2.0+4.0i) -- unboxed unary float complex
-TR opt: float-complex-conjugate.rkt 14:0 (+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i)) -- unboxed binary float complex
+#<<END
+TR opt: float-complex-conjugate.rkt 15:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-conjugate.rkt 15:3 (conjugate 1.0+2.0i) -- unboxed unary float complex
+TR opt: float-complex-conjugate.rkt 15:35 2.0+4.0i -- unboxed literal
+TR opt: float-complex-conjugate.rkt 15:24 (conjugate 2.0+4.0i) -- unboxed unary float complex
+TR opt: float-complex-conjugate.rkt 15:0 (+ (conjugate 1.0+2.0i) (conjugate 2.0+4.0i)) -- unboxed binary float complex
 3.0-6.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 a8f570d1..7659b56a 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,11 +1,12 @@
 #;
-(
-TR opt: float-complex-div.rkt 13:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-div.rkt 13:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-div.rkt 13:21 3.0+6.0i -- unboxed literal
-TR opt: float-complex-div.rkt 13:0 (/ 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+#<<END
+TR opt: float-complex-div.rkt 14:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-div.rkt 14:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex-div.rkt 14:21 3.0+6.0i -- unboxed literal
+TR opt: float-complex-div.rkt 14:0 (/ 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 0.03333333333333333-0.06666666666666667i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 166c4eac..f9aff1c6 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,14 +1,15 @@
 #;
-(
-TR opt: float-complex-fixnum.rkt 16:3 (modulo 2 1) -- binary nonzero fixnum
-TR opt: float-complex-fixnum.rkt 16:3 (modulo 2 1) -- binary nonzero fixnum
-TR opt: float-complex-fixnum.rkt 16:3 (modulo 2 1) -- binary nonzero fixnum
-TR opt: float-complex-fixnum.rkt 16:3 (modulo 2 1) -- float-arg-expr in complex ops
-TR opt: float-complex-fixnum.rkt 16:16 1.0+2.0i -- unboxed literal
-TR opt: float-complex-fixnum.rkt 16:25 3.0+6.0i -- unboxed literal
-TR opt: float-complex-fixnum.rkt 16:0 (+ (modulo 2 1) 1.0+2.0i 3.0+6.0i) -- unboxed binary float complex
+#<<END
+TR opt: float-complex-fixnum.rkt 17:3 (modulo 2 1) -- binary nonzero fixnum
+TR opt: float-complex-fixnum.rkt 17:3 (modulo 2 1) -- binary nonzero fixnum
+TR opt: float-complex-fixnum.rkt 17:3 (modulo 2 1) -- binary nonzero fixnum
+TR opt: float-complex-fixnum.rkt 17:3 (modulo 2 1) -- float-arg-expr in complex ops
+TR opt: float-complex-fixnum.rkt 17:16 1.0+2.0i -- unboxed literal
+TR opt: float-complex-fixnum.rkt 17:25 3.0+6.0i -- unboxed literal
+TR opt: float-complex-fixnum.rkt 17:0 (+ (modulo 2 1) 1.0+2.0i 3.0+6.0i) -- unboxed binary float complex
 4.0+8.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 53fb2734..5cc4d8fb 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,37 +1,38 @@
 #;
-(
-TR opt: float-complex-float-div.rkt 40:62 x -- unbox float-complex
-TR opt: float-complex-float-div.rkt 40:51 (real-part x) -- complex accessor elimination
+#<<END
 TR opt: float-complex-float-div.rkt 41:62 x -- unbox float-complex
-TR opt: float-complex-float-div.rkt 41:51 (imag-part x) -- complex accessor elimination
-TR opt: float-complex-float-div.rkt 43:9 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 43:13 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 43:6 (/ 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 44:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 44:18 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 44:6 (/ 1.0+2.0i 2.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 45:9 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 45:13 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 45:22 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 45:6 (/ 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 46:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 46:18 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 41:51 (real-part x) -- complex accessor elimination
+TR opt: float-complex-float-div.rkt 42:62 x -- unbox float-complex
+TR opt: float-complex-float-div.rkt 42:51 (imag-part x) -- complex accessor elimination
+TR opt: float-complex-float-div.rkt 44:9 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 44:13 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 44:6 (/ 1.0 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 45:9 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 45:18 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 45:6 (/ 1.0+2.0i 2.0) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 46:9 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 46:13 2.0+4.0i -- unboxed literal
 TR opt: float-complex-float-div.rkt 46:22 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 46:6 (/ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 46:6 (/ 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-float-div.rkt 47:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 47:18 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 47:27 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 47:6 (/ 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 47:18 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 47:22 3.0+6.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 47:6 (/ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-float-div.rkt 48:9 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 48:18 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 48:22 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 48:6 (/ 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-div.rkt 49:9 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 49:13 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-div.rkt 49:17 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-div.rkt 49:6 (/ 1.0 2.0 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 48:18 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 48:27 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 48:6 (/ 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 49:9 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 49:18 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 49:22 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 49:6 (/ 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-div.rkt 50:9 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 50:13 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-div.rkt 50:17 3.0+6.0i -- unboxed literal
+TR opt: float-complex-float-div.rkt 50:6 (/ 1.0 2.0 3.0+6.0i) -- unboxed binary float complex
 '("0.1000000000-0.2000000000" "0.50000000001.0000000000" "-0.0200000000-0.0266666667" "0.16666666670.0000000000" "0.16666666670.0000000000" "0.16666666670.3333333333" "0.0333333333-0.0666666667")
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 436db6ad..a31e04cf 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,34 +1,35 @@
 #;
-(
-TR opt: float-complex-float-mul.rkt 36:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 36:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 36:0 (* 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 37:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 37:12 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 37:0 (* 1.0+2.0i 2.0) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 38:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 38:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 38:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 38:0 (* 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float-mul.rkt 39:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 39:12 2.0 -- float-arg-expr in complex ops
+#<<END
+TR opt: float-complex-float-mul.rkt 37:3 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 37:7 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 37:0 (* 1.0 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 38:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 38:12 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 38:0 (* 1.0+2.0i 2.0) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 39:3 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 39:7 2.0+4.0i -- unboxed literal
 TR opt: float-complex-float-mul.rkt 39:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 39:0 (* 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 39:0 (* 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-float-mul.rkt 40:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 40:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 40:21 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 40:0 (* 1.0+2.0i 2.0+4.0i 3.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:16 3.0+6.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 40:0 (* 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-float-mul.rkt 41:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-mul.rkt 41:12 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 41:16 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-mul.rkt 41:0 (* 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 41:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 41:21 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 41:0 (* 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-mul.rkt 42:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-mul.rkt 42:12 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 42:16 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-mul.rkt 42:0 (* 1.0+2.0i 2.0 3.0) -- unboxed binary float complex
 2.0+4.0i
 2.0+4.0i
 -18.0+24.0i
 -18.0+24.0i
 -18.0+24.0i
 6.0+12.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 6d4fc779..5f18f9e2 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,29 +1,30 @@
 #;
-(
-TR opt: float-complex-float-small.rkt 31:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 31:12 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 31:0 (+ 1.0+2.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 32:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 32:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 32:0 (+ 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 33:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 33:12 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 33:0 (- 1.0+2.0i 3.0) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 34:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 34:7 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 34:0 (- 1.0 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-float-small.rkt 35:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float-small.rkt 35:15 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 35:19 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 35:12 (+ 1.0 2.0) -- binary float
-TR opt: float-complex-float-small.rkt 35:12 (+ 1.0 2.0) -- float-arg-expr in complex ops
-TR opt: float-complex-float-small.rkt 35:0 (+ 1.0+2.0i (+ 1.0 2.0)) -- unboxed binary float complex
+#<<END
+TR opt: float-complex-float-small.rkt 32:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 32:12 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 32:0 (+ 1.0+2.0i 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-small.rkt 33:3 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 33:7 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 33:0 (+ 1.0 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-float-small.rkt 34:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 34:12 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 34:0 (- 1.0+2.0i 3.0) -- unboxed binary float complex
+TR opt: float-complex-float-small.rkt 35:3 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 35:7 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 35:0 (- 1.0 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-float-small.rkt 36:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float-small.rkt 36:15 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 36:19 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 36:12 (+ 1.0 2.0) -- binary float
+TR opt: float-complex-float-small.rkt 36:12 (+ 1.0 2.0) -- float-arg-expr in complex ops
+TR opt: float-complex-float-small.rkt 36:0 (+ 1.0+2.0i (+ 1.0 2.0)) -- unboxed binary float complex
 4.0+2.0i
 3.0+4.0i
 -2.0+2.0i
 -1.0-4.0i
 4.0+2.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 95cb85d6..8954bceb 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,26 +1,27 @@
 #;
-(
-TR opt: float-complex-float.rkt 28:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float.rkt 28:12 2.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float.rkt 28:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 28:0 (+ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 29:3 1.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float.rkt 29:7 2.0+4.0i -- unboxed literal
+#<<END
+TR opt: float-complex-float.rkt 29:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float.rkt 29:12 2.0 -- float-arg-expr in complex ops
 TR opt: float-complex-float.rkt 29:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 29:0 (- 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-float.rkt 30:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float.rkt 30:12 2.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float.rkt 29:0 (+ 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float.rkt 30:3 1.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float.rkt 30:7 2.0+4.0i -- unboxed literal
 TR opt: float-complex-float.rkt 30:16 3.0+6.0i -- unboxed literal
-TR opt: float-complex-float.rkt 30:0 (- 1.0+2.0i 2.0 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-float.rkt 30:0 (- 1.0 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 TR opt: float-complex-float.rkt 31:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-float.rkt 31:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-float.rkt 31:21 3.0 -- float-arg-expr in complex ops
-TR opt: float-complex-float.rkt 31:0 (- 1.0+2.0i 2.0+4.0i 3.0) -- 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 32:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-float.rkt 32:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex-float.rkt 32:21 3.0 -- float-arg-expr in complex ops
+TR opt: float-complex-float.rkt 32:0 (- 1.0+2.0i 2.0+4.0i 3.0) -- unboxed binary float complex
 6.0+8.0i
 -4.0-10.0i
 -4.0-4.0i
 -4.0-2.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 fa76dae7..0c53b4d9 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,12 +1,13 @@
 #;
-(
-TR opt: float-complex-i.rkt 14:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-i.rkt 14:15 0+1.0i -- unboxed literal
-TR opt: float-complex-i.rkt 14:21 2.0+4.0i -- unboxed literal
-TR opt: float-complex-i.rkt 14:12 (* 0+1.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-i.rkt 14:0 (+ 1.0+2.0i (* 0+1.0i 2.0+4.0i)) -- unboxed binary float complex
+#<<END
+TR opt: float-complex-i.rkt 15:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-i.rkt 15:15 0+1.0i -- unboxed literal
+TR opt: float-complex-i.rkt 15:21 2.0+4.0i -- unboxed literal
+TR opt: float-complex-i.rkt 15:12 (* 0+1.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-i.rkt 15:0 (+ 1.0+2.0i (* 0+1.0i 2.0+4.0i)) -- unboxed binary float complex
 -3.0+4.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 22535e95..ede3ff8d 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,10 +1,11 @@
 #;
-(
-TR opt: float-complex-integer.rkt 12:3 (expt 2 100) -- float-arg-expr in complex ops
-TR opt: float-complex-integer.rkt 12:16 1.0+2.0i -- unboxed literal
-TR opt: float-complex-integer.rkt 12:0 (+ (expt 2 100) 1.0+2.0i) -- unboxed binary float complex
+#<<END
+TR opt: float-complex-integer.rkt 13:3 (expt 2 100) -- float-arg-expr in complex ops
+TR opt: float-complex-integer.rkt 13:16 1.0+2.0i -- unboxed literal
+TR opt: float-complex-integer.rkt 13:0 (+ (expt 2 100) 1.0+2.0i) -- unboxed binary float complex
 1.2676506002282294e+30+2.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 18d9c439..e8e414e1 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,11 +1,12 @@
 #;
-(
-TR opt: float-complex-mult.rkt 13:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 13:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 13:21 3.0+6.0i -- unboxed literal
-TR opt: float-complex-mult.rkt 13:0 (* 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+#<<END
+TR opt: float-complex-mult.rkt 14:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-mult.rkt 14:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex-mult.rkt 14:21 3.0+6.0i -- unboxed literal
+TR opt: float-complex-mult.rkt 14:0 (* 1.0+2.0i 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
 -66.0-12.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 41425d40..c4f5eea7 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,15 +1,16 @@
 #;
-(
-TR opt: float-complex-parts.rkt 17:11 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts.rkt 17:0 (real-part 1.0+2.0i) -- complex accessor elimination
+#<<END
 TR opt: float-complex-parts.rkt 18:11 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts.rkt 18:0 (imag-part 1.0+2.0i) -- complex accessor elimination
+TR opt: float-complex-parts.rkt 18:0 (real-part 1.0+2.0i) -- complex accessor elimination
 TR opt: float-complex-parts.rkt 19:11 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts.rkt 19:0 (real-part 1.0+2.0i) -- complex accessor elimination
+TR opt: float-complex-parts.rkt 19:0 (imag-part 1.0+2.0i) -- complex accessor elimination
+TR opt: float-complex-parts.rkt 20:11 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts.rkt 20:0 (real-part 1.0+2.0i) -- complex accessor elimination
 1.0
 2.0
 1.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 6c458dc1..a9e7dd69 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,38 +1,39 @@
 #;
-(
-TR opt: float-complex-parts2.rkt 42:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 42:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 42:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 42:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 42:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 42:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 42:0 (real-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 43:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 43:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 43:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 43:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 43:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 43:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 43:0 (unsafe-flreal-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 44:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 44:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 44:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 44:14 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 44:23 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 44:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 44:0 (imag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
-TR opt: float-complex-parts2.rkt 45:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 45:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 45:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 45:23 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 45:32 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts2.rkt 45:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: float-complex-parts2.rkt 45:0 (unsafe-flimag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
+#<<END
+TR opt: float-complex-parts2.rkt 43:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 43:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 43:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 43:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 43:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 43:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 43:0 (real-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
+TR opt: float-complex-parts2.rkt 44:23 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 44:32 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 44:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 44:23 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 44:32 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 44:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 44:0 (unsafe-flreal-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
+TR opt: float-complex-parts2.rkt 45:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 45:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 45:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 45:14 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 45:23 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 45:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 45:0 (imag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
+TR opt: float-complex-parts2.rkt 46:23 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 46:32 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 46:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 46:23 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 46:32 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts2.rkt 46:20 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex-parts2.rkt 46:0 (unsafe-flimag-part (+ 1.0+2.0i 2.0+4.0i)) -- complex accessor elimination
 3.0
 3.0
 6.0
 6.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 f9566145..ba24c89a 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,34 +1,35 @@
 #;
-(
-TR opt: float-complex-parts3.rkt 38:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 38:26 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 38:35 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 38:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 38:12 (real-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 38:0 (+ 1.0+2.0i (real-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
+#<<END
 TR opt: float-complex-parts3.rkt 39:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 39:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 39:44 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 39:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 39:12 (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 39:0 (+ 1.0+2.0i (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 39:26 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 39:35 3.0+6.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 39:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 39:12 (real-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
+TR opt: float-complex-parts3.rkt 39:0 (+ 1.0+2.0i (real-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
 TR opt: float-complex-parts3.rkt 40:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 40:26 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 40:35 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 40:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 40:12 (imag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
-TR opt: float-complex-parts3.rkt 40:0 (+ 1.0+2.0i (imag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 40:35 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 40:44 3.0+6.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 40:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 40:12 (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
+TR opt: float-complex-parts3.rkt 40:0 (+ 1.0+2.0i (unsafe-flreal-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
 TR opt: float-complex-parts3.rkt 41:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 41:35 2.0+4.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 41:44 3.0+6.0i -- unboxed literal
-TR opt: float-complex-parts3.rkt 41:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: float-complex-parts3.rkt 41:12 (unsafe-flimag-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 (unsafe-flimag-part (+ 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:35 3.0+6.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 41:23 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 41:12 (imag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
+TR opt: float-complex-parts3.rkt 41:0 (+ 1.0+2.0i (imag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 42:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 42:35 2.0+4.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 42:44 3.0+6.0i -- unboxed literal
+TR opt: float-complex-parts3.rkt 42:32 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: float-complex-parts3.rkt 42:12 (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i)) -- unboxed unary float complex
+TR opt: float-complex-parts3.rkt 42:0 (+ 1.0+2.0i (unsafe-flimag-part (+ 2.0+4.0i 3.0+6.0i))) -- unboxed binary float complex
 6.0+2.0i
 6.0+2.0i
 11.0+2.0i
 11.0+2.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 36eb2fa7..1f3de55c 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,18 +1,19 @@
 #;
-(
-TR missed opt: float-complex-sin.rkt 22:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 22:21 t
-TR info: float-complex-sin.rkt 22:18 (* t 6.28) -- exact real arith
-TR missed opt: float-complex-sin.rkt 22:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 22:18 (* t 6.28)
-TR info: float-complex-sin.rkt 22:13 (sin (* t 6.28)) -- exact real arith
-TR missed opt: float-complex-sin.rkt 22:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 22:21 t
-TR info: float-complex-sin.rkt 22:18 (* t 6.28) -- exact real arith
-TR missed opt: float-complex-sin.rkt 22:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 22:18 (* t 6.28)
-TR info: float-complex-sin.rkt 22:13 (sin (* t 6.28)) -- exact real arith
-TR opt: float-complex-sin.rkt 22:13 (sin (* t 6.28)) -- float-arg-expr in complex ops
-TR opt: float-complex-sin.rkt 22:30 0.0+0.0i -- unboxed literal
-TR opt: float-complex-sin.rkt 22:10 (+ (sin (* t 6.28)) 0.0+0.0i) -- unboxed binary float complex
+#<<END
+TR missed opt: float-complex-sin.rkt 23:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 23:21 t
+TR info: float-complex-sin.rkt 23:18 (* t 6.28) -- exact real arith
+TR missed opt: float-complex-sin.rkt 23:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 23:18 (* t 6.28)
+TR info: float-complex-sin.rkt 23:13 (sin (* t 6.28)) -- exact real arith
+TR missed opt: float-complex-sin.rkt 23:18 (* t 6.28) -- all args float-arg-expr, result not Float -- caused by: 23:21 t
+TR info: float-complex-sin.rkt 23:18 (* t 6.28) -- exact real arith
+TR missed opt: float-complex-sin.rkt 23:13 (sin (* t 6.28)) -- all args float-arg-expr, result not Float -- caused by: 23:18 (* t 6.28)
+TR info: float-complex-sin.rkt 23:13 (sin (* t 6.28)) -- exact real arith
+TR opt: float-complex-sin.rkt 23:13 (sin (* t 6.28)) -- float-arg-expr in complex ops
+TR opt: float-complex-sin.rkt 23:30 0.0+0.0i -- unboxed literal
+TR opt: float-complex-sin.rkt 23:10 (+ (sin (* t 6.28)) 0.0+0.0i) -- unboxed binary float complex
 -0.0031853017931379904+0.0i
-)
+
+END
 
 
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-complex.rkt
index 7909364c..8ba192f4 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,14 +1,15 @@
 #;
-(
-TR opt: float-complex.rkt 16:3 1.0+2.0i -- unboxed literal
-TR opt: float-complex.rkt 16:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex.rkt 16:0 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+#<<END
 TR opt: float-complex.rkt 17:3 1.0+2.0i -- unboxed literal
 TR opt: float-complex.rkt 17:12 2.0+4.0i -- unboxed literal
-TR opt: float-complex.rkt 17:0 (- 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex.rkt 17:0 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: float-complex.rkt 18:3 1.0+2.0i -- unboxed literal
+TR opt: float-complex.rkt 18:12 2.0+4.0i -- unboxed literal
+TR opt: float-complex.rkt 18:0 (- 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 3.0+6.0i
 -1.0-2.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt
index 540baa43..67f65dc7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-fun.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: float-fun.rkt 12:2 (+ x 1.0) -- binary float
-)
+#<<END
+TR opt: float-fun.rkt 13:2 (+ x 1.0) -- binary float
+
+END
 
 #lang typed/racket
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-promotion.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/float-promotion.rkt
index fee7c769..91c3238b 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,12 +1,13 @@
 #;
-(
-TR opt: float-promotion.rkt 14:11 (modulo 1 2) -- binary nonzero fixnum
-TR opt: float-promotion.rkt 14:11 (modulo 1 2) -- binary nonzero fixnum
-TR opt: float-promotion.rkt 14:0 (+ (assert (modulo 1 2) exact-positive-integer?) 2.0) -- binary float
-TR opt: float-promotion.rkt 15:0 (+ (expt 100 100) 2.0) -- binary float
+#<<END
+TR opt: float-promotion.rkt 15:11 (modulo 1 2) -- binary nonzero fixnum
+TR opt: float-promotion.rkt 15:11 (modulo 1 2) -- binary nonzero fixnum
+TR opt: float-promotion.rkt 15:0 (+ (assert (modulo 1 2) exact-positive-integer?) 2.0) -- binary float
+TR opt: float-promotion.rkt 16:0 (+ (expt 100 100) 2.0) -- binary float
 3.0
 1e+200
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 c2f38e70..4118b1c5 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,17 +1,18 @@
 #;
-(
-TR opt: float-real.rkt 18:0 (+ 2.3 (ann 3 Positive-Real)) -- binary float
-TR missed opt: float-real.rkt 19:15 (* (ann 2 Integer) 3.2) -- all args float-arg-expr, result not Float -- caused by: 19:23 2
-TR info: float-real.rkt 19:15 (* (ann 2 Integer) 3.2) -- exact real arith
-TR opt: float-real.rkt 19:0 (+ 2.3 (assert (* (ann 2 Integer) 3.2) positive?)) -- binary float
-TR missed opt: float-real.rkt 20:7 (* (ann 2 Integer) 3.1) -- all args float-arg-expr, result not Float -- caused by: 20:15 2
-TR info: float-real.rkt 20:7 (* (ann 2 Integer) 3.1) -- exact real arith
-TR missed opt: float-real.rkt 20:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- all args float-arg-expr, result not Float -- caused by: 20:7 (* (ann 2 Integer) 3.1)
-TR info: float-real.rkt 20:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- exact real arith
+#<<END
+TR opt: float-real.rkt 19:0 (+ 2.3 (ann 3 Positive-Real)) -- binary float
+TR missed opt: float-real.rkt 20:15 (* (ann 2 Integer) 3.2) -- all args float-arg-expr, result not Float -- caused by: 20:23 2
+TR info: float-real.rkt 20:15 (* (ann 2 Integer) 3.2) -- exact real arith
+TR opt: float-real.rkt 20:0 (+ 2.3 (assert (* (ann 2 Integer) 3.2) positive?)) -- binary float
+TR missed opt: float-real.rkt 21:7 (* (ann 2 Integer) 3.1) -- all args float-arg-expr, result not Float -- caused by: 21:15 2
+TR info: float-real.rkt 21:7 (* (ann 2 Integer) 3.1) -- exact real arith
+TR missed opt: float-real.rkt 21:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- all args float-arg-expr, result not Float -- caused by: 21:7 (* (ann 2 Integer) 3.1)
+TR info: float-real.rkt 21:0 (* 2.3 (* (ann 2 Integer) 3.1)) -- exact real arith
 5.3
 8.7
 14.26
-)
+
+END
 
 #lang typed/racket
 ;; reals within float expressions should be coerced when it's safe to do so
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt
index 68716f49..d2d7ee3e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/flvector-length.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: flvector-length.rkt 10:0 (flvector-length (flvector 0.0 1.2)) -- flvector-length
+#<<END
+TR opt: flvector-length.rkt 11:0 (flvector-length (flvector 0.0 1.2)) -- flvector-length
 2
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt
index 0e2eb493..3679f3f1 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/fx-fl.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: fx-fl.rkt 10:0 (exact->inexact 1) -- fixnum to float
+#<<END
+TR opt: fx-fl.rkt 11:0 (exact->inexact 1) -- fixnum to float
 1.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 cd21b51b..d719a6e9 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-bytes.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-bytes.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: in-bytes.rkt 7:0 #%module-begin -- in-bytes
-TR info: in-bytes.rkt 10:7 display -- hidden parameter
-TR info: in-bytes.rkt 10:7 display -- hidden parameter
-495051)
+#<<END
+TR opt: in-bytes.rkt 8:0 #%module-begin -- in-bytes
+TR info: in-bytes.rkt 11:7 display -- hidden parameter
+TR info: in-bytes.rkt 11:7 display -- hidden parameter
+495051
+END
 #lang typed/scheme
 #:optimize
 (for: ((i : Integer #"123"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt
index 7fe1eab1..da4f6301 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-list.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: in-list.rkt 7:0 #%module-begin -- in-list
-TR info: in-list.rkt 10:7 display -- hidden parameter
-TR info: in-list.rkt 10:7 display -- hidden parameter
-123)
+#<<END
+TR opt: in-list.rkt 8:0 #%module-begin -- in-list
+TR info: in-list.rkt 11:7 display -- hidden parameter
+TR info: in-list.rkt 11:7 display -- hidden parameter
+123
+END
 #lang typed/scheme
 #:optimize
 (for: ((i : Natural '(1 2 3)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt
index b7bf4e5a..5f1cc403 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-range.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: in-range.rkt 7:0 #%module-begin -- in-range
-TR info: in-range.rkt 10:3 display -- hidden parameter
-TR info: in-range.rkt 10:3 display -- hidden parameter
-0123)
+#<<END
+TR opt: in-range.rkt 8:0 #%module-begin -- in-range
+TR info: in-range.rkt 11:3 display -- hidden parameter
+TR info: in-range.rkt 11:3 display -- hidden parameter
+0123
+END
 #lang typed/scheme
 #:optimize
 (for ([i 4])
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt
index a08e6f1f..5262c2f2 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-string.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: in-string.rkt 7:0 #%module-begin -- in-string
-TR info: in-string.rkt 10:7 display -- hidden parameter
-TR info: in-string.rkt 10:7 display -- hidden parameter
-123)
+#<<END
+TR opt: in-string.rkt 8:0 #%module-begin -- in-string
+TR info: in-string.rkt 11:7 display -- hidden parameter
+TR info: in-string.rkt 11:7 display -- hidden parameter
+123
+END
 #lang typed/scheme
 #:optimize
 (for: ((i : Char "123"))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt
index 7976ce6c..04b20c90 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/in-vector.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: in-vector.rkt 7:0 #%module-begin -- in-vector
-TR info: in-vector.rkt 10:7 display -- hidden parameter
-TR info: in-vector.rkt 10:7 display -- hidden parameter
-123)
+#<<END
+TR opt: in-vector.rkt 8:0 #%module-begin -- in-vector
+TR info: in-vector.rkt 11:7 display -- hidden parameter
+TR info: in-vector.rkt 11:7 display -- hidden parameter
+123
+END
 #lang typed/scheme
 #:optimize
 (for: ((i : Integer (vector 1 2 3)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt
index cbbd01a4..7a1c69b6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-binary-nonzero-fixnum.rkt
@@ -1,7 +1,8 @@
 #;
-(
- TR info: invalid-binary-nonzero-fixnum.rkt 10:3 display -- hidden parameter
-)
+#<<END
+TR info: invalid-binary-nonzero-fixnum.rkt 11:3 display -- hidden parameter
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt
index 6ff7e354..7581768a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-derived-pair.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR missed opt: invalid-derived-pair.rkt 12:2 (cadr x) -- car/cdr on a potentially empty list -- caused by: 12:2 (cadr x)
-TR missed opt: invalid-derived-pair.rkt 17:6 (cadr x) -- car/cdr on a potentially empty list -- caused by: 17:6 (cadr x)
-)
+#<<END
+TR missed opt: invalid-derived-pair.rkt 13:2 (cadr x) -- car/cdr on a potentially empty list -- caused by: 13:2 (cadr x)
+TR missed opt: invalid-derived-pair.rkt 18:6 (cadr x) -- car/cdr on a potentially empty list -- caused by: 18:6 (cadr x)
+
+END
 
 #lang typed/racket #:optimize
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt
index 2ba7e726..143e2e1a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-exact-inexact.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: invalid-exact-inexact.rkt 9:0 (exact->inexact 1.0) -- float to float
+#<<END
+TR opt: invalid-exact-inexact.rkt 10:0 (exact->inexact 1.0) -- float to float
 1.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt
index 5e2c31ab..b7b020e3 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-float-comp.rkt
@@ -1,7 +1,8 @@
 #;
-(
+#<<END
 #t
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 6096c76b..d0556b38 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,11 +1,13 @@
 #;
-(
-TR missed opt: invalid-float-promotion.rkt 12:0 (/ (ann 1 Integer) 2.0) -- all args float-arg-expr, result not Float -- caused by: 12:8 1
-TR info: invalid-float-promotion.rkt 12:0 (/ (ann 1 Integer) 2.0) -- exact real arith
-TR missed opt: invalid-float-promotion.rkt 13:0 (* (ann 2/3 Exact-Rational) 3.0) -- all args float-arg-expr, result not Float -- caused by: 13:8 2/3
-TR info: invalid-float-promotion.rkt 13:0 (* (ann 2/3 Exact-Rational) 3.0) -- exact real arith
-0.5 2.0
-)
+#<<END
+TR missed opt: invalid-float-promotion.rkt 14:0 (/ (ann 1 Integer) 2.0) -- all args float-arg-expr, result not Float -- caused by: 14:8 1
+TR info: invalid-float-promotion.rkt 14:0 (/ (ann 1 Integer) 2.0) -- exact real arith
+TR missed opt: invalid-float-promotion.rkt 15:0 (* (ann 2/3 Exact-Rational) 3.0) -- all args float-arg-expr, result not Float -- caused by: 15:8 2/3
+TR info: invalid-float-promotion.rkt 15:0 (* (ann 2/3 Exact-Rational) 3.0) -- exact real arith
+0.5
+2.0
+
+END
 #lang typed/scheme
 #:optimize
 ;; the ann are necessary, since (* PosReal Float) -> Float (exact 0 is not in PosReal)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt
index c0f1fd69..da0a647b 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-fxquotient.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR missed opt: invalid-fxquotient.rkt 12:21 (quotient fixnum-min -1) -- out of fixnum range
+#<<END
+TR missed opt: invalid-fxquotient.rkt 13:21 (quotient fixnum-min -1) -- out of fixnum range
 #t
-)
+
+END
 
 #lang typed/racket/base
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt
index 3a8bad9e..f41d8b37 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-inexact-complex-parts.rkt
@@ -1,7 +1,8 @@
 #;
-(
+#<<END
 1
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt
index 378fc470..92cf9bf7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-log-complex.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR missed opt: invalid-log-complex.rkt 10:11 (log (ann 2.0 Float)) -- unexpected complex type
+#<<END
+TR missed opt: invalid-log-complex.rkt 11:11 (log (ann 2.0 Float)) -- unexpected complex type
 0.6931471805599453
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt
index 607b0d4a..1356ccdb 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-flrectangular.rkt
@@ -1,7 +1,8 @@
 #;
-(
+#<<END
 1+2i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt
index 4c3b0d1d..3c9a54b0 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-make-polar.rkt
@@ -1,7 +1,8 @@
 #;
-(
+#<<END
 0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt
index 7c0d85df..379dc0a4 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-mpair.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR missed opt: invalid-mpair.rkt 10:2 (mcar x) -- car/cdr on a potentially empty list -- caused by: 10:8 x
-)
+#<<END
+TR missed opt: invalid-mpair.rkt 11:2 (mcar x) -- car/cdr on a potentially empty list -- caused by: 11:8 x
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt
index 3674eeb4..c4b7e4e7 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-sqrt.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR missed opt: invalid-sqrt.rkt 9:0 (sqrt -2.0) -- unexpected complex type
+#<<END
+TR missed opt: invalid-sqrt.rkt 10:0 (sqrt -2.0) -- unexpected complex type
 0+1.4142135623730951i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 263fc14a..4ea78c95 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let.rkt
@@ -1,29 +1,30 @@
 #;
-(
-TR opt: invalid-unboxed-let.rkt 35:14 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 35:17 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 35:11 (+ t1 t1) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 35:14 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 35:17 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 35:11 (+ t1 t1) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 35:14 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 35:17 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let.rkt 35:11 (+ t1 t1) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 31:13 1.0+2.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 31:22 2.0+4.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 31:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 32:13 3.0+6.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 32:22 4.0+8.0i -- unboxed literal
-TR opt: invalid-unboxed-let.rkt 32:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let.rkt 31: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 35:3 display -- hidden parameter
-TR opt: invalid-unboxed-let.rkt 35:14 t1 -- leave var unboxed
-TR opt: invalid-unboxed-let.rkt 35:17 t1 -- leave var unboxed
-TR opt: invalid-unboxed-let.rkt 35:11 (+ t1 t1) -- unboxed binary float complex
+#<<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
-6.0+12.0i7.0+14.0i1.0+2.0i1)
+TR info: invalid-unboxed-let.rkt 39:3 display -- hidden parameter
+6.0+12.0i7.0+14.0i1.0+2.0i1
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-unboxed-let2.rkt
index 74b49c56..b6405231 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,16 +1,17 @@
 #;
-(
-TR opt: invalid-unboxed-let2.rkt 21:33 1.0+2.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 21:42 2.0+4.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 21:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let2.rkt 21:55 3.0+6.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 21:64 4.0+8.0i -- unboxed literal
-TR opt: invalid-unboxed-let2.rkt 21:52 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: invalid-unboxed-let2.rkt 22:5 t1 -- unbox float-complex
-TR opt: invalid-unboxed-let2.rkt 22:8 t2 -- unbox float-complex
-TR opt: invalid-unboxed-let2.rkt 22:2 (+ t1 t2) -- unboxed binary float complex
+#<<END
+TR opt: invalid-unboxed-let2.rkt 22:33 1.0+2.0i -- unboxed literal
+TR opt: invalid-unboxed-let2.rkt 22:42 2.0+4.0i -- unboxed literal
+TR opt: invalid-unboxed-let2.rkt 22:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: invalid-unboxed-let2.rkt 22:55 3.0+6.0i -- unboxed literal
+TR opt: invalid-unboxed-let2.rkt 22:64 4.0+8.0i -- unboxed literal
+TR opt: invalid-unboxed-let2.rkt 22:52 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
+TR opt: invalid-unboxed-let2.rkt 23:5 t1 -- unbox float-complex
+TR opt: invalid-unboxed-let2.rkt 23:8 t2 -- unbox float-complex
+TR opt: invalid-unboxed-let2.rkt 23:2 (+ t1 t2) -- unboxed binary float complex
 10.0+20.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt
index 368664ea..08b277ea 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-ref.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: invalid-vector-ref.rkt 10:2 (vector-ref x 0) -- vector partial bounds checking elimination
-)
+#<<END
+TR opt: invalid-vector-ref.rkt 11:2 (vector-ref x 0) -- vector partial bounds checking elimination
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt
index 7f3cfede..4c5d2c3b 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/invalid-vector-set.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: invalid-vector-set.rkt 10:2 (vector-set! x 0 2) -- vector partial bounds checking elimination
-)
+#<<END
+TR opt: invalid-vector-set.rkt 11:2 (vector-set! x 0 2) -- vector partial bounds checking elimination
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt
index 9522a91e..cc53793d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/known-length-lists.rkt
@@ -1,18 +1,18 @@
 #;
-(
-TR opt: known-length-lists.rkt 39:0 (length l) -- known-length list length
-TR opt: known-length-lists.rkt 40:0 (list-ref l i) -- known-length list op
-TR opt: known-length-lists.rkt 41:0 (list-ref l j) -- known-length list op
-TR opt: known-length-lists.rkt 42:0 (list-ref l k) -- known-length list op
-TR opt: known-length-lists.rkt 43:0 (list-tail l i) -- known-length list op
-TR opt: known-length-lists.rkt 44:0 (list-tail l j) -- known-length list op
-TR opt: known-length-lists.rkt 45:0 (list-tail l k) -- known-length list op
-TR opt: known-length-lists.rkt 46:0 (list-ref l 0) -- known-length list op
-TR opt: known-length-lists.rkt 47:0 (list-ref l 1) -- known-length list op
-TR opt: known-length-lists.rkt 48:0 (list-ref l 2) -- known-length list op
-TR opt: known-length-lists.rkt 49:0 (list-tail l 0) -- known-length list op
-TR opt: known-length-lists.rkt 50:0 (list-tail l 1) -- known-length list op
-TR opt: known-length-lists.rkt 51:0 (list-tail l 2) -- known-length list op
+#<<END
+TR opt: known-length-lists.rkt 40:0 (length l) -- known-length list length
+TR opt: known-length-lists.rkt 41:0 (list-ref l i) -- known-length list op
+TR opt: known-length-lists.rkt 42:0 (list-ref l j) -- known-length list op
+TR opt: known-length-lists.rkt 43:0 (list-ref l k) -- known-length list op
+TR opt: known-length-lists.rkt 44:0 (list-tail l i) -- known-length list op
+TR opt: known-length-lists.rkt 45:0 (list-tail l j) -- known-length list op
+TR opt: known-length-lists.rkt 46:0 (list-tail l k) -- known-length list op
+TR opt: known-length-lists.rkt 47:0 (list-ref l 0) -- known-length list op
+TR opt: known-length-lists.rkt 48:0 (list-ref l 1) -- known-length list op
+TR opt: known-length-lists.rkt 49:0 (list-ref l 2) -- known-length list op
+TR opt: known-length-lists.rkt 50:0 (list-tail l 0) -- known-length list op
+TR opt: known-length-lists.rkt 51:0 (list-tail l 1) -- known-length list op
+TR opt: known-length-lists.rkt 52:0 (list-tail l 2) -- known-length list op
 '(1 2 3)
 3
 1
@@ -27,7 +27,8 @@ TR opt: known-length-lists.rkt 51:0 (list-tail l 2) -- known-length list op
 '(1 2 3)
 '(2 3)
 '(3)
-)
+
+END
 
 #lang typed/racket
 
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 d56d60dd..beffabf0 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,9 +1,10 @@
 #;
-(
-TR opt: known-vector-length.rkt 11:5 (vector-length (ann (vector 1 2) (Vector Integer Integer))) -- known-length vector-length
-TR opt: known-vector-length.rkt 11:0 (+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer)))) -- fixnum bounded expr
+#<<END
+TR opt: known-vector-length.rkt 12:5 (vector-length (ann (vector 1 2) (Vector Integer Integer))) -- known-length vector-length
+TR opt: known-vector-length.rkt 12:0 (+ 2 (vector-length (ann (vector 1 2) (Vector Integer Integer)))) -- fixnum bounded expr
 4
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt
index 9bdbcae7..a2d74aed 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-float.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: let-float.rkt 11:9 (+ 3.0 2.0) -- binary float
-TR opt: let-float.rkt 12:2 (* 9.0 x) -- binary float
+#<<END
+TR opt: let-float.rkt 12:9 (+ 3.0 2.0) -- binary float
+TR opt: let-float.rkt 13:2 (* 9.0 x) -- binary float
 45.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt
index eb332c22..bcf2026e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/let-rhs.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: let-rhs.rkt 12:9 (+ 1.0 2.0) -- binary float
+#<<END
+TR opt: let-rhs.rkt 13:9 (+ 1.0 2.0) -- binary float
 3.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 cf7d3c18..b21c1388 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,25 +1,26 @@
 #;
-(
-TR opt: list.rkt 27:0 (first l) -- pair
-TR opt: list.rkt 28:0 (rest l) -- pair
-TR opt: list.rkt 29:0 (second l) -- pair
-TR opt: list.rkt 29:0 (second l) -- pair
-TR missed opt: list.rkt 30:0 (rest (rest l)) -- car/cdr on a potentially empty list -- caused by: 30:6 (rest l)
-TR opt: list.rkt 30:6 (rest l) -- pair
-TR opt: list.rkt 31:0 (third l) -- pair
-TR opt: list.rkt 31:0 (third l) -- pair
-TR opt: list.rkt 31:0 (third l) -- pair
-TR opt: list.rkt 32:0 (fourth l) -- pair
-TR opt: list.rkt 32:0 (fourth l) -- pair
-TR opt: list.rkt 32:0 (fourth l) -- pair
-TR opt: list.rkt 32:0 (fourth l) -- pair
+#<<END
+TR opt: list.rkt 28:0 (first l) -- pair
+TR opt: list.rkt 29:0 (rest l) -- pair
+TR opt: list.rkt 30:0 (second l) -- pair
+TR opt: list.rkt 30:0 (second l) -- pair
+TR missed opt: list.rkt 31:0 (rest (rest l)) -- car/cdr on a potentially empty list -- caused by: 31:6 (rest l)
+TR opt: list.rkt 31:6 (rest l) -- pair
+TR opt: list.rkt 32:0 (third l) -- pair
+TR opt: list.rkt 32:0 (third l) -- pair
+TR opt: list.rkt 32:0 (third l) -- pair
+TR opt: list.rkt 33:0 (fourth l) -- pair
+TR opt: list.rkt 33:0 (fourth l) -- pair
+TR opt: list.rkt 33:0 (fourth l) -- pair
+TR opt: list.rkt 33:0 (fourth l) -- pair
 1
 '(2 3 4)
 2
 '(3 4)
 3
 4
-)
+
+END
 
 #lang typed/racket
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt
index 67668bca..f6c3bc65 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/literal-int.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: literal-int.rkt 13:0 (+ 1 2.0) -- binary float
+#<<END
+TR opt: literal-int.rkt 14:0 (+ 1 2.0) -- binary float
 3.0
 1
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 0ad676e8..b6f46a48 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,9 +1,10 @@
 #;
-(
-TR opt: magnitude.rkt 13:11 3.0+4.0i -- unboxed literal
-TR opt: magnitude.rkt 13:0 (magnitude 3.0+4.0i) -- unboxed unary float complex
+#<<END
+TR opt: magnitude.rkt 14:11 3.0+4.0i -- unboxed literal
+TR opt: magnitude.rkt 14:0 (magnitude 3.0+4.0i) -- unboxed unary float complex
 5.0
-)
+
+END
 
 #lang typed/racket/base
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt
index bf1d12e5..b264560b 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/make-flrectangular.rkt
@@ -1,10 +1,11 @@
 #;
-(
-TR opt: make-flrectangular.rkt 12:0 (make-rectangular 1.0 2.2) -- binary float comp
-TR opt: make-flrectangular.rkt 13:0 (make-flrectangular 1.0 2.2) -- binary float comp
+#<<END
+TR opt: make-flrectangular.rkt 13:0 (make-rectangular 1.0 2.2) -- binary float comp
+TR opt: make-flrectangular.rkt 14:0 (make-flrectangular 1.0 2.2) -- binary float comp
 1.0+2.2i
 1.0+2.2i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 34c606ce..a8c630dc 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,21 +1,22 @@
 #;
-(
-TR opt: make-polar.rkt 27:6 (make-polar 1.0 1.0) -- make-rectangular elimination
-TR opt: make-polar.rkt 27:6 (make-polar 1.0 1.0) -- make-polar
-TR opt: make-polar.rkt 31:50 p -- unbox float-complex
-TR opt: make-polar.rkt 31:39 (real-part p) -- unboxed unary float complex
-TR opt: make-polar.rkt 30:12 1.0+2.0i -- unboxed literal
-TR opt: make-polar.rkt 30:21 (make-polar 2.0 4.0) -- make-rectangular elimination
-TR opt: make-polar.rkt 30:9 (+ 1.0+2.0i (make-polar 2.0 4.0)) -- unboxed binary float complex
-TR opt: make-polar.rkt 30: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 31:50 p -- unboxed complex variable
-TR opt: make-polar.rkt 31:50 p -- leave var unboxed
-TR opt: make-polar.rkt 31:39 (real-part p) -- complex accessor elimination
+#<<END
+TR opt: make-polar.rkt 28:6 (make-polar 1.0 1.0) -- make-rectangular elimination
+TR opt: make-polar.rkt 28:6 (make-polar 1.0 1.0) -- make-polar
+TR opt: make-polar.rkt 32:50 p -- unbox float-complex
+TR opt: make-polar.rkt 32:39 (real-part p) -- unboxed unary float complex
+TR opt: make-polar.rkt 31:12 1.0+2.0i -- unboxed literal
+TR opt: make-polar.rkt 31:21 (make-polar 2.0 4.0) -- make-rectangular elimination
+TR opt: make-polar.rkt 31:9 (+ 1.0+2.0i (make-polar 2.0 4.0)) -- unboxed binary float complex
+TR opt: make-polar.rkt 31:0 (let ((p (+ 1.0+2.0i (make-polar 2.0 4.0)))) (string-append (real->decimal-string (real-part p) 3) (real->decimal-string (imag-part p) 3))) -- unboxed let bindings
 TR opt: make-polar.rkt 32:50 p -- unboxed complex variable
 TR opt: make-polar.rkt 32:50 p -- leave var unboxed
-TR opt: make-polar.rkt 32:39 (imag-part p) -- complex accessor elimination
+TR opt: make-polar.rkt 32:39 (real-part p) -- complex accessor elimination
+TR opt: make-polar.rkt 33:50 p -- unboxed complex variable
+TR opt: make-polar.rkt 33:50 p -- leave var unboxed
+TR opt: make-polar.rkt 33:39 (imag-part p) -- complex accessor elimination
 "-0.3070.486"
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 cd5d9b23..7adbb4c0 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,10 +1,11 @@
 #;
-(
-TR opt: maybe-exact-complex.rkt 14:3 1.0+2.0i -- unboxed literal
-TR opt: maybe-exact-complex.rkt 14:12 2+4i -- unboxed literal
-TR opt: maybe-exact-complex.rkt 14:0 (+ 1.0+2.0i 2+4i) -- unboxed binary float complex
+#<<END
+TR opt: maybe-exact-complex.rkt 15:3 1.0+2.0i -- unboxed literal
+TR opt: maybe-exact-complex.rkt 15:12 2+4i -- unboxed literal
+TR opt: maybe-exact-complex.rkt 15:0 (+ 1.0+2.0i 2+4i) -- unboxed binary float complex
 3.0+6.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt
index efd7c8c5..bd76315a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/module-path.rkt
@@ -1,10 +1,11 @@
 #;
-(
-TR opt: module-path.rkt 12:0 (unless (module-path? 2) #f) -- dead then branch
+#<<END
+TR opt: module-path.rkt 13:0 (unless (module-path? 2) #f) -- dead then branch
 #t
 #f
 #f
-)
+
+END
 
 #lang typed/racket #:optimize
 (if (module-path? "a") #t #f)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt
index 72d66b23..bc4fc0a5 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/mpair.rkt
@@ -1,15 +1,16 @@
 #;
-(
-TR opt: mpair.rkt 19:0 (mcar x) -- pair
-TR opt: mpair.rkt 20:0 (mcdr x) -- pair
-TR opt: mpair.rkt 21:0 (set-mcar! x (+ 1 2)) -- pair
-TR opt: mpair.rkt 21:13 (+ 1 2) -- fixnum bounded expr
-TR opt: mpair.rkt 22:0 (set-mcdr! x (+ 1.0 2.0)) -- pair
-TR opt: mpair.rkt 22:13 (+ 1.0 2.0) -- binary float
-TR opt: mpair.rkt 28:6 (mcar x) -- pair
+#<<END
+TR opt: mpair.rkt 20:0 (mcar x) -- pair
+TR opt: mpair.rkt 21:0 (mcdr x) -- pair
+TR opt: mpair.rkt 22:0 (set-mcar! x (+ 1 2)) -- pair
+TR opt: mpair.rkt 22:13 (+ 1 2) -- fixnum bounded expr
+TR opt: mpair.rkt 23:0 (set-mcdr! x (+ 1.0 2.0)) -- pair
+TR opt: mpair.rkt 23:13 (+ 1.0 2.0) -- binary float
+TR opt: mpair.rkt 29:6 (mcar x) -- pair
 1
 1.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 24cb5101..f1d4a0d4 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/multi-flcomp.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/multi-flcomp.rkt
@@ -1,17 +1,18 @@
 #;
-(
-TR opt: multi-flcomp.rkt 18:0 (<= 1.0 2.0 3.0) -- multi float comp
-TR opt: multi-flcomp.rkt 20:0 (<= 1.0 2.0 3.0 4.0) -- multi float comp
-TR opt: multi-flcomp.rkt 21:16 (+ 2.0 2.0) -- binary float
-TR opt: multi-flcomp.rkt 21:0 (<= 1.0 2.0 3.0 (+ 2.0 2.0)) -- multi float comp
-TR opt: multi-flcomp.rkt 22:12 (+ 2.0 2.0) -- binary float
-TR opt: multi-flcomp.rkt 22:0 (<= 1.0 2.0 (+ 2.0 2.0) 3.0) -- multi float comp
+#<<END
+TR opt: multi-flcomp.rkt 19:0 (<= 1.0 2.0 3.0) -- multi float comp
+TR opt: multi-flcomp.rkt 21:0 (<= 1.0 2.0 3.0 4.0) -- multi float comp
+TR opt: multi-flcomp.rkt 22:16 (+ 2.0 2.0) -- binary float
+TR opt: multi-flcomp.rkt 22:0 (<= 1.0 2.0 3.0 (+ 2.0 2.0)) -- multi float comp
+TR opt: multi-flcomp.rkt 23:12 (+ 2.0 2.0) -- binary float
+TR opt: multi-flcomp.rkt 23:0 (<= 1.0 2.0 (+ 2.0 2.0) 3.0) -- multi float comp
 #t
 #t
 #t
 #t
 #f
-)
+
+END
 
 #lang typed/racket
 
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 01812b68..8fb83103 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,12 +1,13 @@
 #;
-(
-TR opt: n-ary-float-complex.rkt 14:3 1.0+2.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 14:12 2.0+4.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 14:21 3.0+6.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 14:30 4.0+8.0i -- unboxed literal
-TR opt: n-ary-float-complex.rkt 14:0 (+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
+#<<END
+TR opt: n-ary-float-complex.rkt 15:3 1.0+2.0i -- unboxed literal
+TR opt: n-ary-float-complex.rkt 15:12 2.0+4.0i -- unboxed literal
+TR opt: n-ary-float-complex.rkt 15:21 3.0+6.0i -- unboxed literal
+TR opt: n-ary-float-complex.rkt 15:30 4.0+8.0i -- unboxed literal
+TR opt: n-ary-float-complex.rkt 15:0 (+ 1.0+2.0i 2.0+4.0i 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
 10.0+20.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt
index 2f16809c..ad0ed2e6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/n-ary-float.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: n-ary-float.rkt 10:0 (+ 1.0 2.0 3.0) -- binary float
+#<<END
+TR opt: n-ary-float.rkt 11:0 (+ 1.0 2.0 3.0) -- binary float
 6.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 d27e6fb0..dd4e5200 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,12 +1,13 @@
 #;
-(
-TR opt: nested-float-complex.rkt 14:3 1.0+2.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 14:15 2.0+4.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 14:24 3.0+6.0i -- unboxed literal
-TR opt: nested-float-complex.rkt 14:12 (- 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: nested-float-complex.rkt 14:0 (+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i)) -- unboxed binary float complex
+#<<END
+TR opt: nested-float-complex.rkt 15:3 1.0+2.0i -- unboxed literal
+TR opt: nested-float-complex.rkt 15:15 2.0+4.0i -- unboxed literal
+TR opt: nested-float-complex.rkt 15:24 3.0+6.0i -- unboxed literal
+TR opt: nested-float-complex.rkt 15:12 (- 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: nested-float-complex.rkt 15:0 (+ 1.0+2.0i (- 2.0+4.0i 3.0+6.0i)) -- unboxed binary float complex
 0.0+0.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 eeaad583..5af3a2bf 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,9 +1,10 @@
 #;
-(
-TR opt: nested-float.rkt 11:7 (+ 3.0 4.0) -- binary float
-TR opt: nested-float.rkt 11:0 (+ 2.0 (+ 3.0 4.0)) -- binary float
+#<<END
+TR opt: nested-float.rkt 12:7 (+ 3.0 4.0) -- binary float
+TR opt: nested-float.rkt 12:0 (+ 2.0 (+ 3.0 4.0)) -- binary float
 9.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 26e483ad..d0dd1b60 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,9 +1,10 @@
 #;
-(
-TR opt: nested-float2.rkt 11:7 (* 3.0 4.0) -- binary float
-TR opt: nested-float2.rkt 11:0 (+ 2.0 (* 3.0 4.0)) -- binary float
+#<<END
+TR opt: nested-float2.rkt 12:7 (* 3.0 4.0) -- binary float
+TR opt: nested-float2.rkt 12:0 (+ 2.0 (* 3.0 4.0)) -- binary float
 14.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 c2aedaaa..d563a4c5 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,39 +1,40 @@
 #;
-(
-TR opt: nested-let-loop.rkt 50:38 r -- unbox float-complex
-TR opt: nested-let-loop.rkt 50:40 s -- unbox float-complex
-TR opt: nested-let-loop.rkt 50:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 43:8 r -- unboxed var -> table
-TR opt: nested-let-loop.rkt 41:6 loop1 -- fun -> unboxed fun
-TR opt: nested-let-loop.rkt 45:10 r -- unboxed complex variable
-TR opt: nested-let-loop.rkt 50:38 r -- leave var unboxed
-TR opt: nested-let-loop.rkt 50:40 s -- unbox float-complex
-TR opt: nested-let-loop.rkt 50:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 48:18 s -- unboxed var -> table
-TR opt: nested-let-loop.rkt 46:16 loop2 -- fun -> unboxed fun
-TR opt: nested-let-loop.rkt 50:38 r -- leave var unboxed
-TR opt: nested-let-loop.rkt 50:40 s -- leave var unboxed
-TR opt: nested-let-loop.rkt 50:35 (+ r s) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 50:20 (loop1 (cdr x) (+ r s)) -- unboxed call site
-TR opt: nested-let-loop.rkt 50:27 (cdr x) -- pair
-TR opt: nested-let-loop.rkt 50:20 (loop1 (cdr x) (+ r s)) -- call to fun with unboxed args
-TR opt: nested-let-loop.rkt 51:38 s -- leave var unboxed
-TR opt: nested-let-loop.rkt 51:40 (car x) -- unbox float-complex
-TR opt: nested-let-loop.rkt 51:40 (car x) -- pair
-TR opt: nested-let-loop.rkt 51:48 (car y) -- unbox float-complex
-TR opt: nested-let-loop.rkt 51:48 (car y) -- pair
-TR opt: nested-let-loop.rkt 51:35 (+ s (car x) (car y)) -- unboxed binary float complex
-TR opt: nested-let-loop.rkt 51:20 (loop2 (cdr y) (+ s (car x) (car y))) -- unboxed call site
-TR opt: nested-let-loop.rkt 51:27 (cdr y) -- pair
-TR opt: nested-let-loop.rkt 51:20 (loop2 (cdr y) (+ s (car x) (car y))) -- call to fun with unboxed args
-TR opt: nested-let-loop.rkt 48:38 0.0+0.0i -- unboxed literal
-TR opt: nested-let-loop.rkt 46: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 46:16 loop2 -- unboxed let loop
-TR opt: nested-let-loop.rkt 43:28 0.0+0.0i -- unboxed literal
-TR opt: nested-let-loop.rkt 41: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 41:6 loop1 -- unboxed let loop
+#<<END
+TR opt: nested-let-loop.rkt 51:38 r -- unbox float-complex
+TR opt: nested-let-loop.rkt 51:40 s -- unbox float-complex
+TR opt: nested-let-loop.rkt 51:35 (+ r s) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 44:8 r -- unboxed var -> table
+TR opt: nested-let-loop.rkt 42:6 loop1 -- fun -> unboxed fun
+TR opt: nested-let-loop.rkt 46:10 r -- unboxed complex variable
+TR opt: nested-let-loop.rkt 51:38 r -- leave var unboxed
+TR opt: nested-let-loop.rkt 51:40 s -- unbox float-complex
+TR opt: nested-let-loop.rkt 51:35 (+ r s) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 49:18 s -- unboxed var -> table
+TR opt: nested-let-loop.rkt 47:16 loop2 -- fun -> unboxed fun
+TR opt: nested-let-loop.rkt 51:38 r -- leave var unboxed
+TR opt: nested-let-loop.rkt 51:40 s -- leave var unboxed
+TR opt: nested-let-loop.rkt 51:35 (+ r s) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 51:20 (loop1 (cdr x) (+ r s)) -- unboxed call site
+TR opt: nested-let-loop.rkt 51:27 (cdr x) -- pair
+TR opt: nested-let-loop.rkt 51:20 (loop1 (cdr x) (+ r s)) -- call to fun with unboxed args
+TR opt: nested-let-loop.rkt 52:38 s -- leave var unboxed
+TR opt: nested-let-loop.rkt 52:40 (car x) -- unbox float-complex
+TR opt: nested-let-loop.rkt 52:40 (car x) -- pair
+TR opt: nested-let-loop.rkt 52:48 (car y) -- unbox float-complex
+TR opt: nested-let-loop.rkt 52:48 (car y) -- pair
+TR opt: nested-let-loop.rkt 52:35 (+ s (car x) (car y)) -- unboxed binary float complex
+TR opt: nested-let-loop.rkt 52:20 (loop2 (cdr y) (+ s (car x) (car y))) -- unboxed call site
+TR opt: nested-let-loop.rkt 52:27 (cdr y) -- pair
+TR opt: nested-let-loop.rkt 52:20 (loop2 (cdr y) (+ s (car x) (car y))) -- call to fun with unboxed args
+TR opt: nested-let-loop.rkt 49:38 0.0+0.0i -- unboxed literal
+TR opt: nested-let-loop.rkt 47:10 (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))) -- unboxed call site
+TR opt: nested-let-loop.rkt 47:16 loop2 -- unboxed let loop
+TR opt: nested-let-loop.rkt 44:28 0.0+0.0i -- unboxed literal
+TR opt: nested-let-loop.rkt 42:0 (let: loop1 : Float-Complex ((x : (Listof Float-Complex) (quote (1.0+2.0i 2.0+4.0i))) (r : Float-Complex 0.0+0.0i)) (if (null? x) r (let: loop2 : Float-Complex ((y : (Listof Float-Complex) (quote (3.0+6.0i 4.0+8.0i))) (s : Float-Complex 0.0+0.0i)) (if (null? y) (loop1 (cdr x) (+ r s)) (loop2 (cdr y) (+ s (car x) (car y))))))) -- unboxed call site
+TR opt: nested-let-loop.rkt 42:6 loop1 -- unboxed let loop
 20.0+40.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt
index cec999e0..c6623ac3 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair1.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: nested-pair1.rkt 11:0 (car (cdr (quote (1 2)))) -- pair
-TR opt: nested-pair1.rkt 11:5 (cdr (quote (1 2))) -- pair
+#<<END
+TR opt: nested-pair1.rkt 12:0 (car (cdr (quote (1 2)))) -- pair
+TR opt: nested-pair1.rkt 12:5 (cdr (quote (1 2))) -- pair
 2
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt
index ee216187..4946e2bb 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/nested-pair2.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: nested-pair2.rkt 11:0 (car (cdr (cons 3 (cons (cons 2 (quote ())) 1)))) -- pair
-TR opt: nested-pair2.rkt 11:5 (cdr (cons 3 (cons (cons 2 (quote ())) 1))) -- pair
+#<<END
+TR opt: nested-pair2.rkt 12:0 (car (cdr (cons 3 (cons (cons 2 (quote ())) 1)))) -- pair
+TR opt: nested-pair2.rkt 12:5 (cdr (cons 3 (cons (cons 2 (quote ())) 1))) -- pair
 '(2)
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 5373a61b..202d42bc 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,24 +1,25 @@
 #;
-(
-TR opt: nested-unboxed-let.rkt 27:14 x -- unbox float-complex
-TR opt: nested-unboxed-let.rkt 27:16 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 27:11 (+ x 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 26:12 1.0+2.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 26:21 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 26:9 (+ 1.0+2.0i 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 26: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 28:7 x -- unbox float-complex
-TR opt: nested-unboxed-let.rkt 28:9 3.0+6.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 28:4 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 27:14 x -- leave var unboxed
-TR opt: nested-unboxed-let.rkt 27:16 2.0+3.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 27:11 (+ x 2.0+3.0i) -- unboxed binary float complex
-TR opt: nested-unboxed-let.rkt 27:2 (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i)) -- unboxed let bindings
-TR opt: nested-unboxed-let.rkt 28:7 x -- leave var unboxed
-TR opt: nested-unboxed-let.rkt 28:9 3.0+6.0i -- unboxed literal
-TR opt: nested-unboxed-let.rkt 28:4 (+ x 3.0+6.0i) -- unboxed binary float complex
+#<<END
+TR opt: nested-unboxed-let.rkt 28:14 x -- unbox float-complex
+TR opt: nested-unboxed-let.rkt 28:16 2.0+3.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 28:11 (+ x 2.0+3.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 27:12 1.0+2.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 27:21 2.0+3.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 27:9 (+ 1.0+2.0i 2.0+3.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 27:0 (let ((x (+ 1.0+2.0i 2.0+3.0i))) (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i))) -- unboxed let bindings
+TR opt: nested-unboxed-let.rkt 29:7 x -- unbox float-complex
+TR opt: nested-unboxed-let.rkt 29:9 3.0+6.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 29:4 (+ x 3.0+6.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 28:14 x -- leave var unboxed
+TR opt: nested-unboxed-let.rkt 28:16 2.0+3.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 28:11 (+ x 2.0+3.0i) -- unboxed binary float complex
+TR opt: nested-unboxed-let.rkt 28:2 (let ((x (+ x 2.0+3.0i))) (+ x 3.0+6.0i)) -- unboxed let bindings
+TR opt: nested-unboxed-let.rkt 29:7 x -- leave var unboxed
+TR opt: nested-unboxed-let.rkt 29:9 3.0+6.0i -- unboxed literal
+TR opt: nested-unboxed-let.rkt 29:4 (+ x 3.0+6.0i) -- unboxed binary float complex
 8.0+14.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt
index 497a827f..df404037 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/one-arg-arith.rkt
@@ -1,20 +1,20 @@
 #;
-(
-TR opt: one-arg-arith.rkt 40:0 (- 12) -- unary fixnum
-TR opt: one-arg-arith.rkt 41:0 (- 12.0) -- unary float
-TR opt: one-arg-arith.rkt 42:0 (/ 4.2) -- unary float
-TR opt: one-arg-arith.rkt 44:0 (+ 1) -- unary number
-TR opt: one-arg-arith.rkt 45:0 (+ 1.0) -- unary number
-TR opt: one-arg-arith.rkt 46:0 (+ (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 47:0 (* 1) -- unary number
-TR opt: one-arg-arith.rkt 48:0 (* 1.0) -- unary number
-TR opt: one-arg-arith.rkt 49:0 (* (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 50:0 (min 1) -- unary number
-TR opt: one-arg-arith.rkt 51:0 (min 1.0) -- unary number
-TR opt: one-arg-arith.rkt 52:0 (min (expt 2 100)) -- unary number
-TR opt: one-arg-arith.rkt 53:0 (max 1) -- unary number
-TR opt: one-arg-arith.rkt 54:0 (max 1.0) -- unary number
-TR opt: one-arg-arith.rkt 55:0 (max (expt 2 100)) -- unary number
+#<<END
+TR opt: one-arg-arith.rkt 41:0 (- 12) -- unary fixnum
+TR opt: one-arg-arith.rkt 42:0 (- 12.0) -- unary float
+TR opt: one-arg-arith.rkt 43:0 (/ 4.2) -- unary float
+TR opt: one-arg-arith.rkt 45:0 (+ 1) -- unary number
+TR opt: one-arg-arith.rkt 46:0 (+ 1.0) -- unary number
+TR opt: one-arg-arith.rkt 47:0 (+ (expt 2 100)) -- unary number
+TR opt: one-arg-arith.rkt 48:0 (* 1) -- unary number
+TR opt: one-arg-arith.rkt 49:0 (* 1.0) -- unary number
+TR opt: one-arg-arith.rkt 50:0 (* (expt 2 100)) -- unary number
+TR opt: one-arg-arith.rkt 51:0 (min 1) -- unary number
+TR opt: one-arg-arith.rkt 52:0 (min 1.0) -- unary number
+TR opt: one-arg-arith.rkt 53:0 (min (expt 2 100)) -- unary number
+TR opt: one-arg-arith.rkt 54:0 (max 1) -- unary number
+TR opt: one-arg-arith.rkt 55:0 (max 1.0) -- unary number
+TR opt: one-arg-arith.rkt 56:0 (max (expt 2 100)) -- unary number
 -12
 -12.0
 0.23809523809523808
@@ -30,7 +30,8 @@ TR opt: one-arg-arith.rkt 55:0 (max (expt 2 100)) -- unary number
 1
 1.0
 1267650600228229401496703205376
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt
index dbe99fd4..cf23c4f4 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-fun.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: pair-fun.rkt 13:6 (car x) -- pair
-)
+#<<END
+TR opt: pair-fun.rkt 14:6 (car x) -- pair
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt
index 9496ff76..c5c92481 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pair-known-length-list.rkt
@@ -1,24 +1,25 @@
 #;
-(
-TR opt: pair-known-length-list.rkt 27:0 (car x) -- pair
-TR opt: pair-known-length-list.rkt 28:0 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 29:0 (car (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 29:5 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 30:0 (cdr (cdr x)) -- pair
+#<<END
+TR opt: pair-known-length-list.rkt 28:0 (car x) -- pair
+TR opt: pair-known-length-list.rkt 29:0 (cdr x) -- pair
+TR opt: pair-known-length-list.rkt 30:0 (car (cdr x)) -- pair
 TR opt: pair-known-length-list.rkt 30:5 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 31:0 (car (cdr (cdr x))) -- pair
-TR opt: pair-known-length-list.rkt 31:5 (cdr (cdr x)) -- pair
-TR opt: pair-known-length-list.rkt 31:10 (cdr x) -- pair
-TR opt: pair-known-length-list.rkt 32:0 (cdr (cdr (cdr x))) -- pair
+TR opt: pair-known-length-list.rkt 31:0 (cdr (cdr x)) -- pair
+TR opt: pair-known-length-list.rkt 31:5 (cdr x) -- pair
+TR opt: pair-known-length-list.rkt 32:0 (car (cdr (cdr x))) -- pair
 TR opt: pair-known-length-list.rkt 32:5 (cdr (cdr x)) -- pair
 TR opt: pair-known-length-list.rkt 32:10 (cdr x) -- pair
+TR opt: pair-known-length-list.rkt 33:0 (cdr (cdr (cdr x))) -- pair
+TR opt: pair-known-length-list.rkt 33:5 (cdr (cdr x)) -- pair
+TR opt: pair-known-length-list.rkt 33:10 (cdr x) -- pair
 1
 '(2 3)
 2
 '(3)
 3
 '()
-)
+
+END
 
 #lang typed/racket #:optimize
 
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 1f21f0b0..a26360f8 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13468.rkt
@@ -1,37 +1,37 @@
 #;
-(
-TR opt: pr13468.rkt 86:13 6.0+2.3i -- unboxed literal
-TR opt: pr13468.rkt 86:13 6.0+2.3i -- unboxed literal
-TR opt: pr13468.rkt 86:5 (- (ann 6.0+2.3i Float-Complex)) -- unboxed unary float complex
-TR opt: pr13468.rkt 87:13 6.0+2.3i -- unboxed literal
-TR opt: pr13468.rkt 87:13 6.0+2.3i -- unboxed literal
-TR opt: pr13468.rkt 87:5 (/ (ann 6.0+2.3i Float-Complex)) -- unboxed unary float complex
-TR missed opt: pr13468.rkt 88:5 (/ (ann 0.0+0.0i Float-Complex) (ann 1 Number)) -- Float-Complex division, potential exact 0s on the rhss -- caused by: 88:42 1
-TR missed opt: pr13468.rkt 91:5 (expt (ann -5.0 Flonum) (ann 2.0 Flonum)) -- unexpected complex type
-TR opt: pr13468.rkt 112:21 0.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 112:5 (magnitude (ann 0.0 Flonum-Zero)) -- unboxed unary float complex
-TR opt: pr13468.rkt 113:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 113:5 (magnitude (ann 6.0 Positive-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 114:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 114:5 (magnitude (ann 6.0 Nonnegative-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 115:21 -6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 115:5 (magnitude (ann -6.0 Nonpositive-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 116:21 -6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 116:5 (magnitude (ann -6.0 Negative-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 117:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 117:5 (magnitude (ann 6.0 Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 138:21 0.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 138:5 (real-part (ann 0.0 Flonum-Zero)) -- unboxed unary float complex
-TR opt: pr13468.rkt 139:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 139:5 (real-part (ann 6.0 Positive-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 140:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 140:5 (real-part (ann 6.0 Nonnegative-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 141:21 -6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 141:5 (real-part (ann -6.0 Nonpositive-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 142:21 -6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 142:5 (real-part (ann -6.0 Negative-Flonum)) -- unboxed unary float complex
-TR opt: pr13468.rkt 143:21 6.0 -- float-arg-expr in complex ops
-TR opt: pr13468.rkt 143:5 (real-part (ann 6.0 Flonum)) -- unboxed unary float complex
+#<<END
+TR opt: pr13468.rkt 88:13 6.0+2.3i -- unboxed literal
+TR opt: pr13468.rkt 88:13 6.0+2.3i -- unboxed literal
+TR opt: pr13468.rkt 88:5 (- (ann 6.0+2.3i Float-Complex)) -- unboxed unary float complex
+TR opt: pr13468.rkt 89:13 6.0+2.3i -- unboxed literal
+TR opt: pr13468.rkt 89:13 6.0+2.3i -- unboxed literal
+TR opt: pr13468.rkt 89:5 (/ (ann 6.0+2.3i Float-Complex)) -- unboxed unary float complex
+TR missed opt: pr13468.rkt 90:5 (/ (ann 0.0+0.0i Float-Complex) (ann 1 Number)) -- Float-Complex division, potential exact 0s on the rhss -- caused by: 90:42 1
+TR missed opt: pr13468.rkt 93:5 (expt (ann -5.0 Flonum) (ann 2.0 Flonum)) -- unexpected complex type
+TR opt: pr13468.rkt 114:21 0.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 114:5 (magnitude (ann 0.0 Flonum-Zero)) -- unboxed unary float complex
+TR opt: pr13468.rkt 115:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 115:5 (magnitude (ann 6.0 Positive-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 116:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 116:5 (magnitude (ann 6.0 Nonnegative-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 117:21 -6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 117:5 (magnitude (ann -6.0 Nonpositive-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 118:21 -6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 118:5 (magnitude (ann -6.0 Negative-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 119:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 119:5 (magnitude (ann 6.0 Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 140:21 0.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 140:5 (real-part (ann 0.0 Flonum-Zero)) -- unboxed unary float complex
+TR opt: pr13468.rkt 141:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 141:5 (real-part (ann 6.0 Positive-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 142:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 142:5 (real-part (ann 6.0 Nonnegative-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 143:21 -6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 143:5 (real-part (ann -6.0 Nonpositive-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 144:21 -6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 144:5 (real-part (ann -6.0 Negative-Flonum)) -- unboxed unary float complex
+TR opt: pr13468.rkt 145:21 6.0 -- float-arg-expr in complex ops
+TR opt: pr13468.rkt 145:5 (real-part (ann 6.0 Flonum)) -- unboxed unary float complex
 -6.0-2.3i
 0.1453136352627755-0.055703560184063944i
 0.0+0.0i
@@ -76,7 +76,9 @@ TR opt: pr13468.rkt 143:5 (real-part (ann 6.0 Flonum)) -- unboxed unary float co
 -6.0
 -6.0
 6.0
-0)
+0
+
+END
 
 #lang typed/racket
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt
index ee11b30f..887c26c2 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/pr13788.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: pr13788.rkt 9:0 (vector-length (vector 1 2 3)) -- known-length vector-length
+#<<END
+TR opt: pr13788.rkt 10:0 (vector-length (vector 1 2 3)) -- known-length vector-length
 3
-)
+
+END
 
 #lang typed/racket
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt
index a8be9955..524e571b 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/quote.rkt
@@ -1,7 +1,8 @@
 #;
-(
+#<<END
 '(+ 1.0 2.0)
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt
index 5f104925..062ae350 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/rational-literal.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: rational-literal.rkt 8:0 (+ 3/4 1.2) -- binary float
+#<<END
+TR opt: rational-literal.rkt 9:0 (+ 3/4 1.2) -- binary float
 1.95
-)
+
+END
 #lang typed/racket #:optimize
 ;; rational literals should be promoted to floats at compile time
 (+ 3/4 1.2)
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 2db45aac..60141c09 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,23 +1,24 @@
 #;
-(
-TR opt: real-part-loop.rkt 29:20 v -- unbox float-complex
-TR opt: real-part-loop.rkt 29:9 (real-part v) -- unboxed unary float complex
-TR opt: real-part-loop.rkt 28:13 v -- unboxed var -> table
-TR opt: real-part-loop.rkt 28:6 loop -- fun -> unboxed fun
-TR opt: real-part-loop.rkt 29:20 v -- unboxed complex variable
-TR opt: real-part-loop.rkt 29:20 v -- leave var unboxed
-TR opt: real-part-loop.rkt 29:9 (real-part v) -- complex accessor elimination
-TR opt: real-part-loop.rkt 29:6 (> (real-part v) 70000.2) -- binary float comp
-TR opt: real-part-loop.rkt 31:15 v -- leave var unboxed
-TR opt: real-part-loop.rkt 31:17 3.6 -- float-arg-expr in complex ops
-TR opt: real-part-loop.rkt 31:12 (+ v 3.6) -- unboxed binary float complex
-TR opt: real-part-loop.rkt 31:6 (loop (+ v 3.6)) -- unboxed call site
-TR opt: real-part-loop.rkt 31:6 (loop (+ v 3.6)) -- call to fun with unboxed args
-TR opt: real-part-loop.rkt 28:15 0.0+1.0i -- unboxed literal
-TR opt: real-part-loop.rkt 28: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 28:6 loop -- unboxed let loop
+#<<END
+TR opt: real-part-loop.rkt 30:20 v -- unbox float-complex
+TR opt: real-part-loop.rkt 30:9 (real-part v) -- unboxed unary float complex
+TR opt: real-part-loop.rkt 29:13 v -- unboxed var -> table
+TR opt: real-part-loop.rkt 29:6 loop -- fun -> unboxed fun
+TR opt: real-part-loop.rkt 30:20 v -- unboxed complex variable
+TR opt: real-part-loop.rkt 30:20 v -- leave var unboxed
+TR opt: real-part-loop.rkt 30:9 (real-part v) -- complex accessor elimination
+TR opt: real-part-loop.rkt 30:6 (> (real-part v) 70000.2) -- binary float comp
+TR opt: real-part-loop.rkt 32:15 v -- leave var unboxed
+TR opt: real-part-loop.rkt 32:17 3.6 -- float-arg-expr in complex ops
+TR opt: real-part-loop.rkt 32:12 (+ v 3.6) -- unboxed binary float complex
+TR opt: real-part-loop.rkt 32:6 (loop (+ v 3.6)) -- unboxed call site
+TR opt: real-part-loop.rkt 32:6 (loop (+ v 3.6)) -- call to fun with unboxed args
+TR opt: real-part-loop.rkt 29:15 0.0+1.0i -- unboxed literal
+TR opt: real-part-loop.rkt 29:1 (let loop ((v 0.0+1.0i)) (if (> (real-part v) 70000.2) 0 (loop (+ v 3.6)))) -- unboxed call site
+TR opt: real-part-loop.rkt 29:6 loop -- unboxed let loop
 0
-)
+
+END
 
 #lang typed/racket/base
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt
index 5124650d..9b3d9a49 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/silent-dead-branch.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: silent-dead-branch.rkt 12:0 (when (number? "1") 1) -- dead then branch
-)
+#<<END
+TR opt: silent-dead-branch.rkt 13:0 (when (number? "1") 1) -- dead then branch
+
+END
 
 #lang typed/racket
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt
index e6871776..3994fc6f 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-float.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: simple-float.rkt 10:0 (+ 2.0 3.0) -- binary float
+#<<END
+TR opt: simple-float.rkt 11:0 (+ 2.0 3.0) -- binary float
 5.0
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt
index 60e06b54..73cf0929 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/simple-pair.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: simple-pair.rkt 10:0 (car (cons 1 2)) -- pair
+#<<END
+TR opt: simple-pair.rkt 11:0 (car (cons 1 2)) -- pair
 1
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 df1fa224..c78d784d 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt-segfault.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt-segfault.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: sqrt-segfault.rkt 18:14 (- 0.0 0.0) -- binary float
-TR opt: sqrt-segfault.rkt 19:14 (* dx dx) -- binary float
-TR missed opt: sqrt-segfault.rkt 20:31 (sqrt dist2) -- unexpected complex type
-)
+#<<END
+TR opt: sqrt-segfault.rkt 19:14 (- 0.0 0.0) -- binary float
+TR opt: sqrt-segfault.rkt 20:14 (* dx dx) -- binary float
+TR missed opt: sqrt-segfault.rkt 21:31 (sqrt dist2) -- unexpected complex type
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt
index f7863856..4f6b16f0 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/sqrt.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: sqrt.rkt 11:2 (sqrt x) -- unary float
-)
+#<<END
+TR opt: sqrt.rkt 12:2 (sqrt x) -- unary float
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt
index 6d32bce8..fdddc7e2 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/string-length.rkt
@@ -1,10 +1,11 @@
 #;
-(
-TR opt: string-length.rkt 14:0 (string-length "eh") -- string-length
-TR opt: string-length.rkt 15:0 (bytes-length #"eh") -- bytes-length
+#<<END
+TR opt: string-length.rkt 15:0 (string-length "eh") -- string-length
+TR opt: string-length.rkt 16:0 (bytes-length #"eh") -- bytes-length
 2
 2
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt
index cebe4301..dbb9429c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/structs.rkt
@@ -1,10 +1,11 @@
 #;
-(
-TR info: structs.rkt 12:11 pt -- struct constructor
-TR opt: structs.rkt 13:0 (pt-x a) -- struct ref
-TR opt: structs.rkt 14:0 (set-pt-y! a 5) -- struct set
+#<<END
+TR info: structs.rkt 13:11 pt -- struct constructor
+TR opt: structs.rkt 14:0 (pt-x a) -- struct ref
+TR opt: structs.rkt 15:0 (set-pt-y! a 5) -- struct set
 3
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt
index 78f7b7f3..55dee125 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/ternary-equality.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: ternary-equality.rkt 12:0 (= 1 1 1) -- multi fixnum comp
+#<<END
+TR opt: ternary-equality.rkt 13:0 (= 1 1 1) -- multi fixnum comp
 #t
-)
+
+END
 
 #lang typed/racket/base
 #:optimize
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 999e7b55..a5198477 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,10 +1,11 @@
 #;
-(
-TR opt: unary-fixnum-nested.rkt 12:26 (length (quote (1 2 3))) -- known-length list length
-TR opt: unary-fixnum-nested.rkt 12:13 (bitwise-not (length (quote (1 2 3)))) -- unary fixnum
-TR opt: unary-fixnum-nested.rkt 12:0 (bitwise-not (bitwise-not (length (quote (1 2 3))))) -- unary fixnum
+#<<END
+TR opt: unary-fixnum-nested.rkt 13:26 (length (quote (1 2 3))) -- known-length list length
+TR opt: unary-fixnum-nested.rkt 13:13 (bitwise-not (length (quote (1 2 3)))) -- unary fixnum
+TR opt: unary-fixnum-nested.rkt 13:0 (bitwise-not (bitwise-not (length (quote (1 2 3))))) -- unary fixnum
 3
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt
index 780fd9bd..8b94e656 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-fixnum.rkt
@@ -1,11 +1,12 @@
 #;
-(
-TR opt: unary-fixnum.rkt 13:0 (bitwise-not 4) -- unary fixnum
-TR opt: unary-fixnum.rkt 14:0 (- (ann 2 Nonnegative-Fixnum)) -- unary fixnum
+#<<END
+TR opt: unary-fixnum.rkt 14:0 (bitwise-not 4) -- unary fixnum
+TR opt: unary-fixnum.rkt 15:0 (- (ann 2 Nonnegative-Fixnum)) -- unary fixnum
 -5
 -2
 2
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt
index a5512376..133047ba 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/unary-float.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: unary-float.rkt 10:0 (sin 2.0) -- unary float
+#<<END
+TR opt: unary-float.rkt 11:0 (sin 2.0) -- unary float
 0.9092974268256817
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 f4af2b46..5f5a9caf 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,25 +1,26 @@
 #;
-(
-TR opt: unboxed-exp.rkt 29:50 p -- unbox float-complex
-TR opt: unboxed-exp.rkt 29:39 (real-part p) -- complex accessor elimination
+#<<END
 TR opt: unboxed-exp.rkt 30:50 p -- unbox float-complex
-TR opt: unboxed-exp.rkt 30:39 (imag-part p) -- complex accessor elimination
-TR opt: unboxed-exp.rkt 32:30 2.0+3.4i -- unboxed literal
-TR opt: unboxed-exp.rkt 32:25 (exp 2.0+3.4i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 33:30 0.0+0.0i -- unboxed literal
-TR opt: unboxed-exp.rkt 33:25 (exp 0.0+0.0i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 34:30 -12.2-4.7i -- unboxed literal
-TR opt: unboxed-exp.rkt 34:25 (exp -12.2-4.7i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 35:30 12.2-4.7i -- unboxed literal
-TR opt: unboxed-exp.rkt 35:25 (exp 12.2-4.7i) -- unboxed unary float complex
-TR opt: unboxed-exp.rkt 36:30 -12.2+4.7i -- unboxed literal
-TR opt: unboxed-exp.rkt 36:25 (exp -12.2+4.7i) -- unboxed unary float complex
+TR opt: unboxed-exp.rkt 30:39 (real-part p) -- complex accessor elimination
+TR opt: unboxed-exp.rkt 31:50 p -- unbox float-complex
+TR opt: unboxed-exp.rkt 31:39 (imag-part p) -- complex accessor elimination
+TR opt: unboxed-exp.rkt 33:30 2.0+3.4i -- unboxed literal
+TR opt: unboxed-exp.rkt 33:25 (exp 2.0+3.4i) -- unboxed unary float complex
+TR opt: unboxed-exp.rkt 34:30 0.0+0.0i -- unboxed literal
+TR opt: unboxed-exp.rkt 34:25 (exp 0.0+0.0i) -- unboxed unary float complex
+TR opt: unboxed-exp.rkt 35:30 -12.2-4.7i -- unboxed literal
+TR opt: unboxed-exp.rkt 35:25 (exp -12.2-4.7i) -- unboxed unary float complex
+TR opt: unboxed-exp.rkt 36:30 12.2-4.7i -- unboxed literal
+TR opt: unboxed-exp.rkt 36:25 (exp 12.2-4.7i) -- unboxed unary float complex
+TR opt: unboxed-exp.rkt 37:30 -12.2+4.7i -- unboxed literal
+TR opt: unboxed-exp.rkt 37:25 (exp -12.2+4.7i) -- unboxed unary float complex
 "-7.14373-1.88821"
 "1.000000.00000"
 "-0.000000.00001"
 "-2462.73189198773.89558"
 "-0.00000-0.00001"
-)
+
+END
 
 #lang typed/racket
 #:optimize
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 c1811357..eb6bdaeb 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,41 +1,42 @@
 #;
-(
-TR opt: unboxed-for.rkt 40:0 #%module-begin -- in-list
-TR opt: unboxed-for.rkt 45:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 45:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 45:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 45:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 45:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 45:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 43:31 sum -- unboxed var -> table
-TR opt: unboxed-for.rkt 43: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 43:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 45:9 i -- unbox float-complex
-TR opt: unboxed-for.rkt 45:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 45:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 43: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 43: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 44:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 44:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 45:9 i -- leave var unboxed
-TR opt: unboxed-for.rkt 45:11 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 45:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 43:31 sum -- leave var unboxed
-TR opt: unboxed-for.rkt 43:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
-TR opt: unboxed-for.rkt 45:9 i -- leave var unboxed
-TR opt: unboxed-for.rkt 45:11 sum -- leave var unboxed
-TR opt: unboxed-for.rkt 45:6 (+ i sum) -- unboxed binary float complex
-TR opt: unboxed-for.rkt 44:13 i -- unboxed complex variable
-TR opt: unboxed-for.rkt 43:31 sum -- unbox float-complex
-TR opt: unboxed-for.rkt 43: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 43: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 43:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 43:31 sum -- unboxed complex variable
-TR opt: unboxed-for.rkt 43:53 0.0+0.0i -- unboxed literal
-TR opt: unboxed-for.rkt 43: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 43:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let loop
+#<<END
+TR opt: unboxed-for.rkt 41:0 #%module-begin -- in-list
+TR opt: unboxed-for.rkt 46:9 i -- unbox float-complex
+TR opt: unboxed-for.rkt 46:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 46:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 46:9 i -- unbox float-complex
+TR opt: unboxed-for.rkt 46:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 46:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 44:31 sum -- unboxed var -> table
+TR opt: unboxed-for.rkt 44:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- fun -> unboxed fun
+TR opt: unboxed-for.rkt 44:31 sum -- unboxed complex variable
+TR opt: unboxed-for.rkt 46:9 i -- unbox float-complex
+TR opt: unboxed-for.rkt 46:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 46:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 44:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unbox float-complex
+TR opt: unboxed-for.rkt 44:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
+TR opt: unboxed-for.rkt 45:13 i -- unboxed complex variable
+TR opt: unboxed-for.rkt 45:13 i -- unboxed complex variable
+TR opt: unboxed-for.rkt 46:9 i -- leave var unboxed
+TR opt: unboxed-for.rkt 46:11 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 46:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 44:31 sum -- leave var unboxed
+TR opt: unboxed-for.rkt 44:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let bindings
+TR opt: unboxed-for.rkt 46:9 i -- leave var unboxed
+TR opt: unboxed-for.rkt 46:11 sum -- leave var unboxed
+TR opt: unboxed-for.rkt 46:6 (+ i sum) -- unboxed binary float complex
+TR opt: unboxed-for.rkt 45:13 i -- unboxed complex variable
+TR opt: unboxed-for.rkt 44:31 sum -- unbox float-complex
+TR opt: unboxed-for.rkt 44:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
+TR opt: unboxed-for.rkt 44:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- call to fun with unboxed args
+TR opt: unboxed-for.rkt 44:31 sum -- unboxed complex variable
+TR opt: unboxed-for.rkt 44:31 sum -- unboxed complex variable
+TR opt: unboxed-for.rkt 44:53 0.0+0.0i -- unboxed literal
+TR opt: unboxed-for.rkt 44:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed call site
+TR opt: unboxed-for.rkt 44:0 (for/fold: : Float-Complex ((sum : Float-Complex 0.0+0.0i)) ((i : Float-Complex (quote (1.0+2.0i 2.0+4.0i)))) (+ i sum)) -- unboxed let loop
 3.0+6.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 78a7f421..053d80d8 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,20 +1,21 @@
 #;
-(
-TR opt: unboxed-let-functions1.rkt 23:45 x -- unbox float-complex
-TR opt: unboxed-let-functions1.rkt 23:47 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 23:42 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 23:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions1.rkt 23:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions1.rkt 23:45 x -- leave var unboxed
-TR opt: unboxed-let-functions1.rkt 23:47 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 23:42 (+ x 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 24:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 24:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions1.rkt 24:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions1.rkt 24:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
-TR opt: unboxed-let-functions1.rkt 24:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
+#<<END
+TR opt: unboxed-let-functions1.rkt 24:45 x -- unbox float-complex
+TR opt: unboxed-let-functions1.rkt 24:47 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let-functions1.rkt 24:42 (+ x 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions1.rkt 24:20 x -- unboxed var -> table
+TR opt: unboxed-let-functions1.rkt 24:7 f -- fun -> unboxed fun
+TR opt: unboxed-let-functions1.rkt 24:45 x -- leave var unboxed
+TR opt: unboxed-let-functions1.rkt 24:47 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let-functions1.rkt 24:42 (+ x 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions1.rkt 25:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions1.rkt 25:17 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions1.rkt 25:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions1.rkt 25:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
+TR opt: unboxed-let-functions1.rkt 25:2 (f (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
 6.0+12.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 5f068d1f..e4ddc5bc 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,25 +1,26 @@
 #;
-(
-TR opt: unboxed-let-functions2.rkt 29:21 x -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 29:23 y -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 29:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 28:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions2.rkt 29:21 x -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 29:23 y -- unbox float-complex
-TR opt: unboxed-let-functions2.rkt 29:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 28:42 y -- unboxed var -> table
-TR opt: unboxed-let-functions2.rkt 28:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions2.rkt 29:21 x -- leave var unboxed
-TR opt: unboxed-let-functions2.rkt 29:23 y -- leave var unboxed
-TR opt: unboxed-let-functions2.rkt 29:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 30:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 30:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 30:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions2.rkt 31:5 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let-functions2.rkt 30:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- unboxed call site
-TR opt: unboxed-let-functions2.rkt 30:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- call to fun with unboxed args
+#<<END
+TR opt: unboxed-let-functions2.rkt 30:21 x -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 30:23 y -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 30:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 29:20 x -- unboxed var -> table
+TR opt: unboxed-let-functions2.rkt 30:21 x -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 30:23 y -- unbox float-complex
+TR opt: unboxed-let-functions2.rkt 30:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 29:42 y -- unboxed var -> table
+TR opt: unboxed-let-functions2.rkt 29:7 f -- fun -> unboxed fun
+TR opt: unboxed-let-functions2.rkt 30:21 x -- leave var unboxed
+TR opt: unboxed-let-functions2.rkt 30:23 y -- leave var unboxed
+TR opt: unboxed-let-functions2.rkt 30:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 31:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions2.rkt 31:17 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions2.rkt 31:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions2.rkt 32:5 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let-functions2.rkt 31:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- unboxed call site
+TR opt: unboxed-let-functions2.rkt 31:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0+6.0i) -- call to fun with unboxed args
 6.0+12.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 6f14d02b..32fcb5d8 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,20 +1,21 @@
 #;
-(
-TR opt: unboxed-let-functions3.rkt 24:21 x -- unbox float-complex
-TR opt: unboxed-let-functions3.rkt 24:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions3.rkt 24:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 23:20 x -- unboxed var -> table
-TR opt: unboxed-let-functions3.rkt 23:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions3.rkt 24:21 x -- leave var unboxed
-TR opt: unboxed-let-functions3.rkt 24:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions3.rkt 24:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 25:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions3.rkt 25:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions3.rkt 25:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions3.rkt 25:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- unboxed call site
-TR opt: unboxed-let-functions3.rkt 25:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- call to fun with unboxed args
+#<<END
+TR opt: unboxed-let-functions3.rkt 25:21 x -- unbox float-complex
+TR opt: unboxed-let-functions3.rkt 25:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions3.rkt 25:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions3.rkt 24:20 x -- unboxed var -> table
+TR opt: unboxed-let-functions3.rkt 24:7 f -- fun -> unboxed fun
+TR opt: unboxed-let-functions3.rkt 25:21 x -- leave var unboxed
+TR opt: unboxed-let-functions3.rkt 25:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions3.rkt 25:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions3.rkt 26:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions3.rkt 26:17 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions3.rkt 26:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions3.rkt 26:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- unboxed call site
+TR opt: unboxed-let-functions3.rkt 26:2 (f (+ 1.0+2.0i 2.0+4.0i) 3.0) -- call to fun with unboxed args
 6.0+6.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 e8962494..844d641b 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,20 +1,21 @@
 #;
-(
-TR opt: unboxed-let-functions4.rkt 24:21 x -- unbox float-complex
-TR opt: unboxed-let-functions4.rkt 24:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions4.rkt 24:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 23:32 x -- unboxed var -> table
-TR opt: unboxed-let-functions4.rkt 23:7 f -- fun -> unboxed fun
-TR opt: unboxed-let-functions4.rkt 24:21 x -- leave var unboxed
-TR opt: unboxed-let-functions4.rkt 24:23 y -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions4.rkt 24:18 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 26:8 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions4.rkt 26:17 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions4.rkt 26:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions4.rkt 25:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
-TR opt: unboxed-let-functions4.rkt 25:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
+#<<END
+TR opt: unboxed-let-functions4.rkt 25:21 x -- unbox float-complex
+TR opt: unboxed-let-functions4.rkt 25:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions4.rkt 25:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions4.rkt 24:32 x -- unboxed var -> table
+TR opt: unboxed-let-functions4.rkt 24:7 f -- fun -> unboxed fun
+TR opt: unboxed-let-functions4.rkt 25:21 x -- leave var unboxed
+TR opt: unboxed-let-functions4.rkt 25:23 y -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions4.rkt 25:18 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-let-functions4.rkt 27:8 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions4.rkt 27:17 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions4.rkt 27:5 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions4.rkt 26:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- unboxed call site
+TR opt: unboxed-let-functions4.rkt 26:2 (f 3.0 (+ 1.0+2.0i 2.0+4.0i)) -- call to fun with unboxed args
 6.0+6.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 34340eb9..cfd3e3a0 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,10 +1,11 @@
 #;
-(
-TR opt: unboxed-let-functions5.rkt 19:15 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let-functions5.rkt 19:24 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions5.rkt 19:12 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+#<<END
+TR opt: unboxed-let-functions5.rkt 20:15 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let-functions5.rkt 20:24 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions5.rkt 20:12 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
 3.0+6.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 e0b3daf9..05b3bdbc 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,25 +1,26 @@
 #;
-(
-TR opt: unboxed-let-functions6.rkt 30:13 z -- unbox float-complex
-TR opt: unboxed-let-functions6.rkt 30:15 0.0+1.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 30:10 (+ z 0.0+1.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 27:31 z -- unboxed var -> table
-TR opt: unboxed-let-functions6.rkt 27:6 loop -- fun -> unboxed fun
-TR opt: unboxed-let-functions6.rkt 30:13 z -- leave var unboxed
-TR opt: unboxed-let-functions6.rkt 30:15 0.0+1.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 30:10 (+ z 0.0+1.0i) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 31:19 z -- leave var unboxed
-TR opt: unboxed-let-functions6.rkt 31:21 (car l) -- pair
-TR opt: unboxed-let-functions6.rkt 31:21 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions6.rkt 31:16 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions6.rkt 31:10 (loop (+ z (car l)) (cdr l)) -- unboxed call site
-TR opt: unboxed-let-functions6.rkt 32:16 (cdr l) -- pair
-TR opt: unboxed-let-functions6.rkt 31:10 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions6.rkt 27:51 0.0+0.0i -- unboxed literal
-TR opt: unboxed-let-functions6.rkt 27: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 27:6 loop -- unboxed let loop
+#<<END
+TR opt: unboxed-let-functions6.rkt 31:13 z -- unbox float-complex
+TR opt: unboxed-let-functions6.rkt 31:15 0.0+1.0i -- unboxed literal
+TR opt: unboxed-let-functions6.rkt 31:10 (+ z 0.0+1.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions6.rkt 28:31 z -- unboxed var -> table
+TR opt: unboxed-let-functions6.rkt 28:6 loop -- fun -> unboxed fun
+TR opt: unboxed-let-functions6.rkt 31:13 z -- leave var unboxed
+TR opt: unboxed-let-functions6.rkt 31:15 0.0+1.0i -- unboxed literal
+TR opt: unboxed-let-functions6.rkt 31:10 (+ z 0.0+1.0i) -- unboxed binary float complex
+TR opt: unboxed-let-functions6.rkt 32:19 z -- leave var unboxed
+TR opt: unboxed-let-functions6.rkt 32:21 (car l) -- pair
+TR opt: unboxed-let-functions6.rkt 32:21 (car l) -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions6.rkt 32:16 (+ z (car l)) -- unboxed binary float complex
+TR opt: unboxed-let-functions6.rkt 32:10 (loop (+ z (car l)) (cdr l)) -- unboxed call site
+TR opt: unboxed-let-functions6.rkt 33:16 (cdr l) -- pair
+TR opt: unboxed-let-functions6.rkt 32:10 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
+TR opt: unboxed-let-functions6.rkt 28:51 0.0+0.0i -- unboxed literal
+TR opt: unboxed-let-functions6.rkt 28:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) (+ z 0.0+1.0i) (loop (+ z (car l)) (cdr l)))) -- unboxed call site
+TR opt: unboxed-let-functions6.rkt 28:6 loop -- unboxed let loop
 6.0+1.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 38095dba..4e32a365 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,24 +1,25 @@
 #;
-(
-TR opt: unboxed-let-functions7.rkt 31:15 z -- unbox float-complex
-TR opt: unboxed-let-functions7.rkt 31:17 (car l) -- pair
-TR opt: unboxed-let-functions7.rkt 31:17 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions7.rkt 31:12 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions7.rkt 27:31 z -- unboxed var -> table
-TR opt: unboxed-let-functions7.rkt 27:6 loop -- fun -> unboxed fun
-TR opt: unboxed-let-functions7.rkt 30:6 z -- unboxed complex variable
-TR opt: unboxed-let-functions7.rkt 31:15 z -- leave var unboxed
-TR opt: unboxed-let-functions7.rkt 31:17 (car l) -- pair
-TR opt: unboxed-let-functions7.rkt 31:17 (car l) -- float-arg-expr in complex ops
-TR opt: unboxed-let-functions7.rkt 31:12 (+ z (car l)) -- unboxed binary float complex
-TR opt: unboxed-let-functions7.rkt 31:6 (loop (+ z (car l)) (cdr l)) -- unboxed call site
-TR opt: unboxed-let-functions7.rkt 32:12 (cdr l) -- pair
-TR opt: unboxed-let-functions7.rkt 31:6 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
-TR opt: unboxed-let-functions7.rkt 27:51 0.0+0.0i -- unboxed literal
-TR opt: unboxed-let-functions7.rkt 27: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 27:6 loop -- unboxed let loop
+#<<END
+TR opt: unboxed-let-functions7.rkt 32:15 z -- unbox float-complex
+TR opt: unboxed-let-functions7.rkt 32:17 (car l) -- pair
+TR opt: unboxed-let-functions7.rkt 32:17 (car l) -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions7.rkt 32:12 (+ z (car l)) -- unboxed binary float complex
+TR opt: unboxed-let-functions7.rkt 28:31 z -- unboxed var -> table
+TR opt: unboxed-let-functions7.rkt 28:6 loop -- fun -> unboxed fun
+TR opt: unboxed-let-functions7.rkt 31:6 z -- unboxed complex variable
+TR opt: unboxed-let-functions7.rkt 32:15 z -- leave var unboxed
+TR opt: unboxed-let-functions7.rkt 32:17 (car l) -- pair
+TR opt: unboxed-let-functions7.rkt 32:17 (car l) -- float-arg-expr in complex ops
+TR opt: unboxed-let-functions7.rkt 32:12 (+ z (car l)) -- unboxed binary float complex
+TR opt: unboxed-let-functions7.rkt 32:6 (loop (+ z (car l)) (cdr l)) -- unboxed call site
+TR opt: unboxed-let-functions7.rkt 33:12 (cdr l) -- pair
+TR opt: unboxed-let-functions7.rkt 32:6 (loop (+ z (car l)) (cdr l)) -- call to fun with unboxed args
+TR opt: unboxed-let-functions7.rkt 28:51 0.0+0.0i -- unboxed literal
+TR opt: unboxed-let-functions7.rkt 28:0 (let: loop : Float-Complex ((z : Float-Complex 0.0+0.0i) (l : (Listof Integer) (quote (1 2 3)))) (if (null? l) z (loop (+ z (car l)) (cdr l)))) -- unboxed call site
+TR opt: unboxed-let-functions7.rkt 28:6 loop -- unboxed let loop
 6.0+0.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 4748aa1d..5e3f37ca 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,10 +1,11 @@
 #;
-(
-TR opt: unboxed-let-functions8.rkt 14:67 x -- unbox float-complex
-TR opt: unboxed-let-functions8.rkt 14:69 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let-functions8.rkt 14:64 (+ x 2.0+4.0i) -- unboxed binary float complex
+#<<END
+TR opt: unboxed-let-functions8.rkt 15:67 x -- unbox float-complex
+TR opt: unboxed-let-functions8.rkt 15:69 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let-functions8.rkt 15:64 (+ x 2.0+4.0i) -- unboxed binary float complex
 3.0+6.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 3170444b..eaa72cfd 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,29 +1,30 @@
 #;
-(
-TR opt: unboxed-let.rkt 34:14 t1 -- unbox float-complex
-TR opt: unboxed-let.rkt 34:17 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let.rkt 34:11 (- t1 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 33:14 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let.rkt 33:23 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let.rkt 33:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 33: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:5 t2 -- unbox float-complex
-TR opt: unboxed-let.rkt 36:8 t3 -- unbox float-complex
-TR opt: unboxed-let.rkt 36:2 (+ t2 t3) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 34:14 t1 -- leave var unboxed
-TR opt: unboxed-let.rkt 34:17 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let.rkt 34:11 (- t1 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 33: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:5 t2 -- leave var unboxed
-TR opt: unboxed-let.rkt 36:8 t3 -- unbox float-complex
-TR opt: unboxed-let.rkt 36:2 (+ t2 t3) -- unboxed binary float complex
-TR opt: unboxed-let.rkt 35:11 4.0+8.0i -- unboxed literal
-TR opt: unboxed-let.rkt 33: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:5 t2 -- leave var unboxed
-TR opt: unboxed-let.rkt 36:8 t3 -- leave var unboxed
-TR opt: unboxed-let.rkt 36:2 (+ t2 t3) -- unboxed binary float complex
+#<<END
+TR opt: unboxed-let.rkt 35:14 t1 -- unbox float-complex
+TR opt: unboxed-let.rkt 35:17 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let.rkt 35:11 (- t1 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 34:14 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let.rkt 34:23 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let.rkt 34:11 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 34:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
+TR opt: unboxed-let.rkt 37:5 t2 -- unbox float-complex
+TR opt: unboxed-let.rkt 37:8 t3 -- unbox float-complex
+TR opt: unboxed-let.rkt 37:2 (+ t2 t3) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 35:14 t1 -- leave var unboxed
+TR opt: unboxed-let.rkt 35:17 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let.rkt 35:11 (- t1 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 34:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
+TR opt: unboxed-let.rkt 37:5 t2 -- leave var unboxed
+TR opt: unboxed-let.rkt 37:8 t3 -- unbox float-complex
+TR opt: unboxed-let.rkt 37:2 (+ t2 t3) -- unboxed binary float complex
+TR opt: unboxed-let.rkt 36:11 4.0+8.0i -- unboxed literal
+TR opt: unboxed-let.rkt 34:0 (let* ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (- t1 3.0+6.0i)) (t3 4.0+8.0i)) (+ t2 t3)) -- unboxed let bindings
+TR opt: unboxed-let.rkt 37:5 t2 -- leave var unboxed
+TR opt: unboxed-let.rkt 37:8 t3 -- leave var unboxed
+TR opt: unboxed-let.rkt 37:2 (+ t2 t3) -- unboxed binary float complex
 4.0+8.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 fb9c1353..9ec7acbe 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,23 +1,24 @@
 #;
-(
-TR opt: unboxed-let2.rkt 27:5 t1 -- unbox float-complex
-TR opt: unboxed-let2.rkt 27:8 t2 -- unbox float-complex
-TR opt: unboxed-let2.rkt 27:2 (+ t1 t2) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 27:5 t1 -- unbox float-complex
-TR opt: unboxed-let2.rkt 27:8 t2 -- unbox float-complex
-TR opt: unboxed-let2.rkt 27:2 (+ t1 t2) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 25:13 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 25:22 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 25:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 26:13 3.0+6.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 26:22 4.0+8.0i -- unboxed literal
-TR opt: unboxed-let2.rkt 26:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
-TR opt: unboxed-let2.rkt 25: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 27:5 t1 -- leave var unboxed
-TR opt: unboxed-let2.rkt 27:8 t2 -- leave var unboxed
-TR opt: unboxed-let2.rkt 27:2 (+ t1 t2) -- unboxed binary float complex
+#<<END
+TR opt: unboxed-let2.rkt 28:5 t1 -- unbox float-complex
+TR opt: unboxed-let2.rkt 28:8 t2 -- unbox float-complex
+TR opt: unboxed-let2.rkt 28:2 (+ t1 t2) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 28:5 t1 -- unbox float-complex
+TR opt: unboxed-let2.rkt 28:8 t2 -- unbox float-complex
+TR opt: unboxed-let2.rkt 28:2 (+ t1 t2) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 26:13 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let2.rkt 26:22 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let2.rkt 26:10 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 27:13 3.0+6.0i -- unboxed literal
+TR opt: unboxed-let2.rkt 27:22 4.0+8.0i -- unboxed literal
+TR opt: unboxed-let2.rkt 27:10 (+ 3.0+6.0i 4.0+8.0i) -- unboxed binary float complex
+TR opt: unboxed-let2.rkt 26:0 (let ((t1 (+ 1.0+2.0i 2.0+4.0i)) (t2 (+ 3.0+6.0i 4.0+8.0i))) (+ t1 t2)) -- unboxed let bindings
+TR opt: unboxed-let2.rkt 28:5 t1 -- leave var unboxed
+TR opt: unboxed-let2.rkt 28:8 t2 -- leave var unboxed
+TR opt: unboxed-let2.rkt 28:2 (+ t1 t2) -- unboxed binary float complex
 10.0+20.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 2db295e3..14cf71c6 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,18 +1,19 @@
 #;
-(
-TR opt: unboxed-let3.rkt 30:9 x -- unbox float-complex
-TR opt: unboxed-let3.rkt 30:11 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 30:6 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let3.rkt 27:12 1.0+2.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 27:21 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 27:9 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-let3.rkt 27: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 29:6 x -- unboxed complex variable
-TR opt: unboxed-let3.rkt 30:9 x -- leave var unboxed
-TR opt: unboxed-let3.rkt 30:11 2.0+4.0i -- unboxed literal
-TR opt: unboxed-let3.rkt 30:6 (+ x 2.0+4.0i) -- unboxed binary float complex
+#<<END
+TR opt: unboxed-let3.rkt 31:9 x -- unbox float-complex
+TR opt: unboxed-let3.rkt 31:11 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let3.rkt 31:6 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let3.rkt 28:12 1.0+2.0i -- unboxed literal
+TR opt: unboxed-let3.rkt 28:21 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let3.rkt 28:9 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-let3.rkt 28:0 (let ((x (+ 1.0+2.0i 2.0+4.0i))) (if (even? 2) x (+ x 2.0+4.0i))) -- unboxed let bindings
+TR opt: unboxed-let3.rkt 30:6 x -- unboxed complex variable
+TR opt: unboxed-let3.rkt 31:9 x -- leave var unboxed
+TR opt: unboxed-let3.rkt 31:11 2.0+4.0i -- unboxed literal
+TR opt: unboxed-let3.rkt 31:6 (+ x 2.0+4.0i) -- unboxed binary float complex
 3.0+6.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 8bfef6bf..75015b00 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,17 +1,18 @@
 #;
-(
-TR opt: unboxed-letrec-syntaxes+values.rkt 21:27 x -- unbox float-complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 21:29 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 21:24 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 20:33 1.0+2.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 20:42 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 20:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec-syntaxes+values.rkt 19: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 21:27 x -- leave var unboxed
-TR opt: unboxed-letrec-syntaxes+values.rkt 21:29 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec-syntaxes+values.rkt 21:24 (+ x 2.0+4.0i) -- unboxed binary float complex
+#<<END
+TR opt: unboxed-letrec-syntaxes+values.rkt 22:27 x -- unbox float-complex
+TR opt: unboxed-letrec-syntaxes+values.rkt 22:29 2.0+4.0i -- unboxed literal
+TR opt: unboxed-letrec-syntaxes+values.rkt 22:24 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-letrec-syntaxes+values.rkt 21:33 1.0+2.0i -- unboxed literal
+TR opt: unboxed-letrec-syntaxes+values.rkt 21:42 2.0+4.0i -- unboxed literal
+TR opt: unboxed-letrec-syntaxes+values.rkt 21:30 (+ 1.0+2.0i 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-letrec-syntaxes+values.rkt 20:0 (letrec-syntaxes+values (((s) (syntax-rules () ((_ x) x)))) (((x) (+ 1.0+2.0i 2.0+4.0i))) (+ x 2.0+4.0i)) -- unboxed let bindings
+TR opt: unboxed-letrec-syntaxes+values.rkt 22:27 x -- leave var unboxed
+TR opt: unboxed-letrec-syntaxes+values.rkt 22:29 2.0+4.0i -- unboxed literal
+TR opt: unboxed-letrec-syntaxes+values.rkt 22:24 (+ x 2.0+4.0i) -- unboxed binary float complex
 5.0+10.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 9b94084b..fe7be5cf 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,21 +1,22 @@
 #;
-(
-TR opt: unboxed-letrec.rkt 28:5 x -- unbox float-complex
-TR opt: unboxed-letrec.rkt 28:7 y -- unbox float-complex
-TR opt: unboxed-letrec.rkt 28:2 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 28:5 x -- unbox float-complex
-TR opt: unboxed-letrec.rkt 28:7 y -- unbox float-complex
-TR opt: unboxed-letrec.rkt 28:2 (+ x y) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 26:31 1.0+2.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 27:34 2.0+4.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 27:43 3.0+6.0i -- unboxed literal
-TR opt: unboxed-letrec.rkt 27:31 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
-TR opt: unboxed-letrec.rkt 25: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 28:5 x -- leave var unboxed
-TR opt: unboxed-letrec.rkt 28:7 y -- leave var unboxed
-TR opt: unboxed-letrec.rkt 28:2 (+ x y) -- unboxed binary float complex
+#<<END
+TR opt: unboxed-letrec.rkt 29:5 x -- unbox float-complex
+TR opt: unboxed-letrec.rkt 29:7 y -- unbox float-complex
+TR opt: unboxed-letrec.rkt 29:2 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-letrec.rkt 29:5 x -- unbox float-complex
+TR opt: unboxed-letrec.rkt 29:7 y -- unbox float-complex
+TR opt: unboxed-letrec.rkt 29:2 (+ x y) -- unboxed binary float complex
+TR opt: unboxed-letrec.rkt 27:31 1.0+2.0i -- unboxed literal
+TR opt: unboxed-letrec.rkt 28:34 2.0+4.0i -- unboxed literal
+TR opt: unboxed-letrec.rkt 28:43 3.0+6.0i -- unboxed literal
+TR opt: unboxed-letrec.rkt 28:31 (+ 2.0+4.0i 3.0+6.0i) -- unboxed binary float complex
+TR opt: unboxed-letrec.rkt 26:0 (letrec: ((f : (Any -> Any) (lambda: ((x : Any)) (f x))) (x : Float-Complex 1.0+2.0i) (y : Float-Complex (+ 2.0+4.0i 3.0+6.0i))) (+ x y)) -- unboxed let bindings
+TR opt: unboxed-letrec.rkt 29:5 x -- leave var unboxed
+TR opt: unboxed-letrec.rkt 29:7 y -- leave var unboxed
+TR opt: unboxed-letrec.rkt 29:2 (+ x y) -- unboxed binary float complex
 6.0+12.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
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 dbc2b464..b275da06 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,24 +1,25 @@
 #;
-(
-TR opt: unboxed-make-rectangular.rkt 30:5 x -- unbox float-complex
-TR opt: unboxed-make-rectangular.rkt 30:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 30:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 29:9 (make-rectangular 1.0 2.0) -- make-rectangular elimination
-TR opt: unboxed-make-rectangular.rkt 29:0 (let ((x (make-rectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-make-rectangular.rkt 30:5 x -- leave var unboxed
-TR opt: unboxed-make-rectangular.rkt 30:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 30:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 32:5 x -- unbox float-complex
-TR opt: unboxed-make-rectangular.rkt 32:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 32:2 (+ x 2.0+4.0i) -- unboxed binary float complex
-TR opt: unboxed-make-rectangular.rkt 31:9 (unsafe-make-flrectangular 1.0 2.0) -- make-rectangular elimination
-TR opt: unboxed-make-rectangular.rkt 31:0 (let ((x (unsafe-make-flrectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
-TR opt: unboxed-make-rectangular.rkt 32:5 x -- leave var unboxed
-TR opt: unboxed-make-rectangular.rkt 32:7 2.0+4.0i -- unboxed literal
-TR opt: unboxed-make-rectangular.rkt 32:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+#<<END
+TR opt: unboxed-make-rectangular.rkt 31:5 x -- unbox float-complex
+TR opt: unboxed-make-rectangular.rkt 31:7 2.0+4.0i -- unboxed literal
+TR opt: unboxed-make-rectangular.rkt 31:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 30:9 (make-rectangular 1.0 2.0) -- make-rectangular elimination
+TR opt: unboxed-make-rectangular.rkt 30:0 (let ((x (make-rectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
+TR opt: unboxed-make-rectangular.rkt 31:5 x -- leave var unboxed
+TR opt: unboxed-make-rectangular.rkt 31:7 2.0+4.0i -- unboxed literal
+TR opt: unboxed-make-rectangular.rkt 31:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 33:5 x -- unbox float-complex
+TR opt: unboxed-make-rectangular.rkt 33:7 2.0+4.0i -- unboxed literal
+TR opt: unboxed-make-rectangular.rkt 33:2 (+ x 2.0+4.0i) -- unboxed binary float complex
+TR opt: unboxed-make-rectangular.rkt 32:9 (unsafe-make-flrectangular 1.0 2.0) -- make-rectangular elimination
+TR opt: unboxed-make-rectangular.rkt 32:0 (let ((x (unsafe-make-flrectangular 1.0 2.0))) (+ x 2.0+4.0i)) -- unboxed let bindings
+TR opt: unboxed-make-rectangular.rkt 33:5 x -- leave var unboxed
+TR opt: unboxed-make-rectangular.rkt 33:7 2.0+4.0i -- unboxed literal
+TR opt: unboxed-make-rectangular.rkt 33:2 (+ x 2.0+4.0i) -- unboxed binary float complex
 3.0+6.0i
 3.0+6.0i
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt
index d87044d1..db155c3c 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-bounds-check.rkt
@@ -1,10 +1,11 @@
 #;
-(
-TR opt: vector-bounds-check.rkt 25:0 (vector-ref (make-my-vector) 0) -- vector partial bounds checking elimination
-TR opt: vector-bounds-check.rkt 26:0 (flvector-ref (make-my-flvector) 0) -- flvector partial bounds checking elimination
+#<<END
+TR opt: vector-bounds-check.rkt 26:0 (vector-ref (make-my-vector) 0) -- vector partial bounds checking elimination
+TR opt: vector-bounds-check.rkt 27:0 (flvector-ref (make-my-flvector) 0) -- flvector partial bounds checking elimination
 1.0
 1.0
-)
+
+END
 
 #lang typed/racket
 (require racket/flonum)
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt
index 06f98d8b..a5782d5b 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone1.rkt
@@ -1,6 +1,7 @@
 #;
-(
-)
+#<<END
+
+END
 #lang racket
 
 (define v (vector 'b 'a))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt
index dbc93134..dd266d25 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-chaperone2.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: vector-chaperone2.rkt 12:10 (vector-ref v i) -- vector partial bounds checking elimination
+#<<END
+TR opt: vector-chaperone2.rkt 13:10 (vector-ref v i) -- vector partial bounds checking elimination
 'b
-)
+
+END
 #lang typed/racket
 (require/typed "vector-chaperone1.rkt"
                (v (Vectorof Symbol)))
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt
index a9029c3a..fa8abee6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length-nested.rkt
@@ -1,9 +1,10 @@
 #;
-(
-TR opt: vector-length-nested.rkt 11:0 (vector-length (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0)) -- vector-length
-TR opt: vector-length-nested.rkt 12:1 (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0) -- vector
+#<<END
+TR opt: vector-length-nested.rkt 12:0 (vector-length (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0)) -- vector-length
+TR opt: vector-length-nested.rkt 13:1 (vector-ref (ann (vector (vector 1 2) 2 3) (Vector (Vectorof Integer) Integer Integer)) 0) -- vector
 2
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt
index 5189bde8..34034ee6 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-length.rkt
@@ -1,10 +1,11 @@
 #;
-(
-TR opt: vector-length.rkt 12:0 (vector-length (vector 1 2 3)) -- known-length vector-length
-TR opt: vector-length.rkt 13:0 (vector-length (ann (vector 4 5 6) (Vectorof Integer))) -- known-length vector-length
+#<<END
+TR opt: vector-length.rkt 13:0 (vector-length (vector 1 2 3)) -- known-length vector-length
+TR opt: vector-length.rkt 14:0 (vector-length (ann (vector 4 5 6) (Vectorof Integer))) -- known-length vector-length
 3
 3
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt
index 748255fd..a4a2872e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref-set-ref.rkt
@@ -1,11 +1,12 @@
 #;
-(
-TR opt: vector-ref-set-ref.rkt 15:0 (vector-ref x 0) -- vector
-TR opt: vector-ref-set-ref.rkt 16:0 (vector-set! x 1 "2") -- vector
-TR opt: vector-ref-set-ref.rkt 17:0 (vector-ref x 1) -- vector
+#<<END
+TR opt: vector-ref-set-ref.rkt 16:0 (vector-ref x 0) -- vector
+TR opt: vector-ref-set-ref.rkt 17:0 (vector-set! x 1 "2") -- vector
+TR opt: vector-ref-set-ref.rkt 18:0 (vector-ref x 1) -- vector
 1
 "2"
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt
index 9e2b744a..1fd25999 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: vector-ref.rkt 10:0 (vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0) -- vector
+#<<END
+TR opt: vector-ref.rkt 11:0 (vector-ref (ann (vector 1 2) (Vector Integer Integer)) 0) -- vector
 1
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt
index 6034fb83..65ea382e 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-ref2.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: vector-ref2.rkt 10:0 (vector-ref (vector 1 2 3) 0) -- vector
+#<<END
+TR opt: vector-ref2.rkt 11:0 (vector-ref (vector 1 2 3) 0) -- vector
 1
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt
index d009c858..0b131007 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set-quote.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: vector-set-quote.rkt 9:0 (vector-set! (ann (vector (quote (1 2))) (Vector Any)) 0 (quote (+ 1.0 2.0))) -- vector
-)
+#<<END
+TR opt: vector-set-quote.rkt 10:0 (vector-set! (ann (vector (quote (1 2))) (Vector Any)) 0 (quote (+ 1.0 2.0))) -- vector
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt
index 5b9ca873..16cf04b8 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: vector-set.rkt 9:0 (vector-set! (ann (vector 1 2) (Vector Integer Integer)) 0 1) -- vector
-)
+#<<END
+TR opt: vector-set.rkt 10:0 (vector-set! (ann (vector 1 2) (Vector Integer Integer)) 0 1) -- vector
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt
index 2fea5bef..14df83e8 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-set2.rkt
@@ -1,7 +1,8 @@
 #;
-(
-TR opt: vector-set2.rkt 9:0 (vector-set! (vector 1 2) 0 2) -- vector
-)
+#<<END
+TR opt: vector-set2.rkt 10:0 (vector-set! (vector 1 2) 0 2) -- vector
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt
index cb29f796..16b2b203 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/vector-sum.rkt
@@ -1,93 +1,94 @@
 #;
-(
-TR opt: vector-sum.rkt 92:0 #%module-begin -- dead else branch
-TR opt: vector-sum.rkt 92:0 #%module-begin -- dead else branch
-TR opt: vector-sum.rkt 92:0 #%module-begin -- dead else branch
-TR opt: vector-sum.rkt 101: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 101: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 101: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 101: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:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 102: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:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 102:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 102: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:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 102: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:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 102:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 101: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 101: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 101: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 104: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 104:15 sum -- dead else branch
-TR opt: vector-sum.rkt 106:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 106:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 104:15 sum -- dead else branch
-TR opt: vector-sum.rkt 104: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 104: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 104:15 sum -- dead else branch
-TR opt: vector-sum.rkt 106:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 106:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 104:15 sum -- dead else branch
-TR opt: vector-sum.rkt 104: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 101: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 101: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 101: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 101: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 101: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:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 102: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:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 102:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 102: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:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- binary fixnum comp
-TR opt: vector-sum.rkt 102: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:4 (vector-set! v i (sin (exact->inexact i))) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 103:26 (exact->inexact i) -- fixnum to float
-TR opt: vector-sum.rkt 103:21 (sin (exact->inexact i)) -- unary float
-TR opt: vector-sum.rkt 102:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- dead else branch
-TR opt: vector-sum.rkt 102:2 (for: ((i : Nonnegative-Fixnum (in-range l))) (vector-set! v i (sin (exact->inexact i)))) -- fixnum bounded expr
-TR opt: vector-sum.rkt 101: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 101: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 101: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 104: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 104:15 sum -- dead else branch
-TR opt: vector-sum.rkt 106:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 106:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 104:15 sum -- dead else branch
-TR opt: vector-sum.rkt 104: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 104: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 104:15 sum -- dead else branch
-TR opt: vector-sum.rkt 106:11 (vector-ref v i) -- vector partial bounds checking elimination
-TR opt: vector-sum.rkt 106:4 (+ sum (vector-ref v i)) -- binary float
-TR opt: vector-sum.rkt 104:15 sum -- dead else branch
-TR opt: vector-sum.rkt 104: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 101: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
+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
 
 #lang typed/racket
 
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt
index 156e7753..e171704b 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/tests/with-type.rkt
@@ -1,8 +1,9 @@
 #;
-(
-TR opt: with-type.rkt 13:18 (#%app + x val) -- binary float
+#<<END
+TR opt: with-type.rkt 14:18 (#%app + x val) -- binary float
 34.6
-)
+
+END
 
 #lang racket
 
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 37ccf8e0..9e92b63b 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,11 +1,12 @@
 #;
-(
-TR opt: zero.rkt 13:0 (zero? 1) -- fixnum zero?
-TR opt: zero.rkt 14:7 (sqrt 3.0) -- unary float
-TR opt: zero.rkt 14:0 (zero? (sqrt 3.0)) -- float zero?
+#<<END
+TR opt: zero.rkt 14:0 (zero? 1) -- fixnum zero?
+TR opt: zero.rkt 15:7 (sqrt 3.0) -- unary float
+TR opt: zero.rkt 15:0 (zero? (sqrt 3.0)) -- float zero?
 #f
 #f
-)
+
+END
 
 #lang typed/scheme
 #:optimize
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt
index 4e0b8101..2c52ccfe 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt
@@ -1,6 +1,6 @@
 #lang racket
 
-(require "run.rkt")
+(require "run.rkt" "../send-places.rkt")
 
 ;; Assuming that only the log format changed, update test files to the
 ;; new format.
@@ -19,9 +19,9 @@
     (with-output-to-file (build-path dir file) #:exists 'truncate
       (lambda ()
         (displayln "#;")
-        (displayln "(")
+        (displayln "#<<END")
         (display new-log)
-        (display ")")
+        (display "\nEND")
         (display rest)))))
 
 ;; proc returns the list of tests to be run on each file
@@ -30,6 +30,7 @@
         #:when (test-file? name))
     (transform name dir)))
 
+(start-workers)
 (cond [(= (vector-length (current-command-line-arguments)) 0)
        (transform-dir tests-dir)
        (transform-dir missed-optimizations-dir)]