diff --git a/collects/tests/typed-scheme/optimizer/missed-optimizations/pair.rkt b/collects/tests/typed-scheme/optimizer/missed-optimizations/pair.rkt
index 12d13e1a..1252fcbe 100644
--- a/collects/tests/typed-scheme/optimizer/missed-optimizations/pair.rkt
+++ b/collects/tests/typed-scheme/optimizer/missed-optimizations/pair.rkt
@@ -1,16 +1,38 @@
 #;
 (
-pair.rkt 36:0 (#%app car (#%app list (quote 1) (quote 2) (quote 3))) -- car/cdr on a potentially empty list -- caused by: 36:10 (#%app list (quote 1) (quote 2) (quote 3))
-pair.rkt 38:0 (#%app cdr (#%app list (quote 1) (quote 2) (quote 3))) -- car/cdr on a potentially empty list -- caused by: 38:10 (#%app list (quote 1) (quote 2) (quote 3))
-pair.rkt 42:16 (#%app cdr (#%app cdr (#%app cdr (#%app cdr (#%app list (quote 1) (quote 2) (quote 3)))))) -- car/cdr on a potentially empty list -- caused by: 42:21 (#%app cdr (#%app cdr (#%app cdr (#%app list (quote 1) (quote 2) (quote 3)))))
-pair.rkt 45:0 (#%app mcar (#%app mcons (quote 1) null)) -- mpair op on a potentially empty mlist -- caused by: (no location) (#%app mcons (quote 1) null)
-pair.rkt 47:0 (#%app mcdr (#%app mcons (quote 1) null)) -- mpair op on a potentially empty mlist -- caused by: (no location) (#%app mcons (quote 1) null)
-pair.rkt 51:0 (#%app set-mcar! (#%app mcons (quote 2) null) (quote 2)) -- mpair op on a potentially empty mlist -- caused by: (no location) (#%app mcons (quote 2) null)
-pair.rkt 53:0 (#%app set-mcdr! (#%app mcons (quote 2) null) (#%app mcons (quote 2) null)) -- mpair op on a potentially empty mlist -- caused by: (no location) (#%app mcons (quote 2) null)
-pair.rkt 59:17 (#%app mcar (quote ())) -- mpair op on a potentially empty mlist -- caused by: 59:23 (quote ())
-pair.rkt 60:17 (#%app mcdr (quote ())) -- mpair op on a potentially empty mlist -- caused by: 60:23 (quote ())
-pair.rkt 61:17 (#%app set-mcar! (quote ()) (quote 2)) -- mpair op on a potentially empty mlist -- caused by: 61:28 (quote ())
-pair.rkt 62:17 (#%app set-mcdr! (quote ()) (#%app mcons (quote 3) null)) -- mpair op on a potentially empty mlist -- caused by: 62:33 (quote ())
+pair.rkt 58:0 (#%app car (#%app list (quote 1) (quote 2) (quote 3))) -- car/cdr on a potentially empty list -- caused by: 58:10 (#%app list (quote 1) (quote 2) (quote 3))
+pair.rkt 59:1 car -- pair
+pair.rkt 60:0 (#%app cdr (#%app list (quote 1) (quote 2) (quote 3))) -- car/cdr on a potentially empty list -- caused by: 60:10 (#%app list (quote 1) (quote 2) (quote 3))
+pair.rkt 61:1 cdr -- pair
+pair.rkt 62:1 cdr -- pair
+pair.rkt 62:6 cdr -- pair
+pair.rkt 63:1 cdr -- pair
+pair.rkt 63:6 cdr -- pair
+pair.rkt 63:11 cdr -- pair
+pair.rkt 64:16 (#%app cdr (#%app cdr (#%app cdr (#%app cdr (#%app list (quote 1) (quote 2) (quote 3)))))) -- car/cdr on a potentially empty list -- caused by: 64:21 (#%app cdr (#%app cdr (#%app cdr (#%app list (quote 1) (quote 2) (quote 3)))))
+pair.rkt 64:22 cdr -- pair
+pair.rkt 64:27 cdr -- pair
+pair.rkt 64:32 cdr -- pair
+pair.rkt 67:0 (#%app mcar (#%app mcons (quote 1) null)) -- mpair op on a potentially empty mlist -- caused by: (no location) (#%app mcons (quote 1) null)
+pair.rkt 68:1 mcar -- mutable pair
+pair.rkt 69:0 (#%app mcdr (#%app mcons (quote 1) null)) -- mpair op on a potentially empty mlist -- caused by: (no location) (#%app mcons (quote 1) null)
+pair.rkt 70:1 mcdr -- mutable pair
+pair.rkt 71:1 mcdr -- mutable pair
+pair.rkt 71:7 mcdr -- mutable pair
+pair.rkt 72:1 mcdr -- mutable pair
+pair.rkt 72:7 mcdr -- mutable pair
+pair.rkt 72:13 mcdr -- mutable pair
+pair.rkt 73:0 (#%app set-mcar! (#%app mcons (quote 2) null) (quote 2)) -- mpair op on a potentially empty mlist -- caused by: (no location) (#%app mcons (quote 2) null)
+pair.rkt 74:1 set-mcar! -- mutable pair
+pair.rkt 75:0 (#%app set-mcdr! (#%app mcons (quote 2) null) (#%app mcons (quote 2) null)) -- mpair op on a potentially empty mlist -- caused by: (no location) (#%app mcons (quote 2) null)
+pair.rkt 77:1 mcar -- mutable pair
+pair.rkt 78:1 mcdr -- mutable pair
+pair.rkt 79:1 set-mcar! -- mutable pair
+pair.rkt 80:1 set-mcdr! -- mutable pair
+pair.rkt 81:17 (#%app mcar (quote ())) -- mpair op on a potentially empty mlist -- caused by: 81:23 (quote ())
+pair.rkt 82:17 (#%app mcdr (quote ())) -- mpair op on a potentially empty mlist -- caused by: 82:23 (quote ())
+pair.rkt 83:17 (#%app set-mcar! (quote ()) (quote 2)) -- mpair op on a potentially empty mlist -- caused by: 83:28 (quote ())
+pair.rkt 84:17 (#%app set-mcdr! (quote ()) (#%app mcons (quote 3) null)) -- mpair op on a potentially empty mlist -- caused by: 84:33 (quote ())
 1
 1
 '(2 3)
diff --git a/collects/tests/typed-scheme/optimizer/missed-optimizations/precision-loss.rkt b/collects/tests/typed-scheme/optimizer/missed-optimizations/precision-loss.rkt
index 1f7b1c52..b89dde94 100644
--- a/collects/tests/typed-scheme/optimizer/missed-optimizations/precision-loss.rkt
+++ b/collects/tests/typed-scheme/optimizer/missed-optimizations/precision-loss.rkt
@@ -1,10 +1,14 @@
 #;
 (
-precision-loss.rkt 20:3 (#%app * (quote 3/4) (quote 2/3)) -- exact arithmetic subexpression inside a float expression, extra precision discarded -- caused by: 20:0 (#%app + (#%app * (quote 3/4) (quote 2/3)) (quote 2.0))
-precision-loss.rkt 24:3 (#%app - (quote 3/4)) -- exact arithmetic subexpression inside a float expression, extra precision discarded -- caused by: 24:0 (#%app + (#%app - (quote 3/4)) (quote 2.0))
-precision-loss.rkt 32:0 (#%app * (#%app * (quote 3/4) (quote 2/3)) (quote 2.0)) -- binary, args all float-arg-expr, return type not Float -- caused by: 32:8 (#%app * (quote 3/4) (quote 2/3))
-precision-loss.rkt 32:8 (#%app * (quote 3/4) (quote 2/3)) -- binary, args all float-arg-expr, return type not Float -- caused by: 32:11 (quote 3/4)
-precision-loss.rkt 32:8 (#%app * (quote 3/4) (quote 2/3)) -- exact arithmetic subexpression inside a float expression, extra precision discarded -- caused by: 32:0 (#%app * (#%app * (quote 3/4) (quote 2/3)) (quote 2.0))
+precision-loss.rkt 24:1 + -- binary float
+precision-loss.rkt 24:3 (#%app * (quote 3/4) (quote 2/3)) -- exact arithmetic subexpression inside a float expression, extra precision discarded -- caused by: 24:0 (#%app + (#%app * (quote 3/4) (quote 2/3)) (quote 2.0))
+precision-loss.rkt 26:1 + -- binary float
+precision-loss.rkt 28:1 + -- binary float
+precision-loss.rkt 28:3 (#%app - (quote 3/4)) -- exact arithmetic subexpression inside a float expression, extra precision discarded -- caused by: 28:0 (#%app + (#%app - (quote 3/4)) (quote 2.0))
+precision-loss.rkt 30:1 + -- binary float
+precision-loss.rkt 36:0 (#%app * (#%app * (quote 3/4) (quote 2/3)) (quote 2.0)) -- binary, args all float-arg-expr, return type not Float -- caused by: 36:8 (#%app * (quote 3/4) (quote 2/3))
+precision-loss.rkt 36:8 (#%app * (quote 3/4) (quote 2/3)) -- binary, args all float-arg-expr, return type not Float -- caused by: 36:11 (quote 3/4)
+precision-loss.rkt 36:8 (#%app * (quote 3/4) (quote 2/3)) -- exact arithmetic subexpression inside a float expression, extra precision discarded -- caused by: 36:0 (#%app * (#%app * (quote 3/4) (quote 2/3)) (quote 2.0))
 2.5
 2.75
 1.25
diff --git a/collects/tests/typed-scheme/optimizer/missed-optimizations/real-in-float-expr.rkt b/collects/tests/typed-scheme/optimizer/missed-optimizations/real-in-float-expr.rkt
index 4e984920..483a3c76 100644
--- a/collects/tests/typed-scheme/optimizer/missed-optimizations/real-in-float-expr.rkt
+++ b/collects/tests/typed-scheme/optimizer/missed-optimizations/real-in-float-expr.rkt
@@ -1,7 +1,9 @@
 #;
 (
- real-in-float-expr.rkt 15:0 (#%app * (quote 3) (quote 2.3)) -- binary, args all float-arg-expr, return type not Float -- caused by: 15:8 (quote 3)
- real-in-float-expr.rkt 24:0 (#%app * (quote 2) (quote 2.0)) -- binary, args all float-arg-expr, return type not Float -- caused by: 24:8 (quote 2)
+real-in-float-expr.rkt 17:0 (#%app * (quote 3) (quote 2.3)) -- binary, args all float-arg-expr, return type not Float -- caused by: 17:8 (quote 3)
+real-in-float-expr.rkt 22:1 * -- fixnum bounded expr
+real-in-float-expr.rkt 23:1 + -- fixnum bounded expr
+real-in-float-expr.rkt 26:0 (#%app * (quote 2) (quote 2.0)) -- binary, args all float-arg-expr, return type not Float -- caused by: 26:8 (quote 2)
  6.8999999999999995
  6
  5
diff --git a/collects/tests/typed-scheme/optimizer/missed-optimizations/unexpected-complex.rkt b/collects/tests/typed-scheme/optimizer/missed-optimizations/unexpected-complex.rkt
index d7ac1be9..e3d840a8 100644
--- a/collects/tests/typed-scheme/optimizer/missed-optimizations/unexpected-complex.rkt
+++ b/collects/tests/typed-scheme/optimizer/missed-optimizations/unexpected-complex.rkt
@@ -1,6 +1,10 @@
 #;
 (
-unexpected-complex.rkt 12:0 (#%app sqrt (quote 4)) -- unexpected complex value -- caused by: 12:1 sqrt
+unexpected-complex.rkt 16:0 (#%app sqrt (quote 4)) -- unexpected complex value -- caused by: 16:1 sqrt
+unexpected-complex.rkt 17:0 (#%app + (quote 1.2+3.4i) (quote 2.0)) -- unboxed float complex
+unexpected-complex.rkt 17:1 + -- unboxed binary float complex
+unexpected-complex.rkt 17:3 1.2+3.4i -- unboxed literal
+unexpected-complex.rkt 17:12 (quote 2.0) -- float-coerce-expr in complex ops
 2
 3.2+3.4i
  )