diff --git a/ml-proto/test/f32.wast b/ml-proto/test/f32.wast
index 45d736141b..9924f24fd2 100644
--- a/ml-proto/test/f32.wast
+++ b/ml-proto/test/f32.wast
@@ -1361,10 +1361,10 @@
 (assert_return (invoke "min" (f32.const -0x0p+0) (f32.const infinity)) (f32.const -0x0p+0))
 (assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -infinity)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const 0x0p+0) (f32.const infinity)) (f32.const 0x0p+0))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -0x0p+0) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const 0x0p+0) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "min" (f32.const -0x0p+0) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const -0x0p+0) (f32.const nan)))
+(assert_return_nan (invoke "min" (f32.const 0x0p+0) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const 0x0p+0) (f32.const nan)))
 (assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -0x0p+0)) (f32.const -0x1p-149))
 (assert_return (invoke "min" (f32.const -0x1p-149) (f32.const 0x0p+0)) (f32.const -0x1p-149))
 (assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -0x0p+0)) (f32.const -0x0p+0))
@@ -1397,10 +1397,10 @@
 (assert_return (invoke "min" (f32.const -0x1p-149) (f32.const infinity)) (f32.const -0x1p-149))
 (assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -infinity)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const 0x1p-149) (f32.const infinity)) (f32.const 0x1p-149))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -0x1p-149) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const 0x1p-149) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "min" (f32.const -0x1p-149) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const -0x1p-149) (f32.const nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1p-149) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1p-149) (f32.const nan)))
 (assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -0x0p+0)) (f32.const -0x1p-126))
 (assert_return (invoke "min" (f32.const -0x1p-126) (f32.const 0x0p+0)) (f32.const -0x1p-126))
 (assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -0x0p+0)) (f32.const -0x0p+0))
@@ -1433,10 +1433,10 @@
 (assert_return (invoke "min" (f32.const -0x1p-126) (f32.const infinity)) (f32.const -0x1p-126))
 (assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -infinity)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const 0x1p-126) (f32.const infinity)) (f32.const 0x1p-126))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -0x1p-126) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const 0x1p-126) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "min" (f32.const -0x1p-126) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const -0x1p-126) (f32.const nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1p-126) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1p-126) (f32.const nan)))
 (assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -0x0p+0)) (f32.const -0x1p-1))
 (assert_return (invoke "min" (f32.const -0x1p-1) (f32.const 0x0p+0)) (f32.const -0x1p-1))
 (assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -0x0p+0)) (f32.const -0x0p+0))
@@ -1469,10 +1469,10 @@
 (assert_return (invoke "min" (f32.const -0x1p-1) (f32.const infinity)) (f32.const -0x1p-1))
 (assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -infinity)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const 0x1p-1) (f32.const infinity)) (f32.const 0x1p-1))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -0x1p-1) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const 0x1p-1) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "min" (f32.const -0x1p-1) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const -0x1p-1) (f32.const nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1p-1) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1p-1) (f32.const nan)))
 (assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -0x0p+0)) (f32.const -0x1p+0))
 (assert_return (invoke "min" (f32.const -0x1p+0) (f32.const 0x0p+0)) (f32.const -0x1p+0))
 (assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
@@ -1505,10 +1505,10 @@
 (assert_return (invoke "min" (f32.const -0x1p+0) (f32.const infinity)) (f32.const -0x1p+0))
 (assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -infinity)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const 0x1p+0) (f32.const infinity)) (f32.const 0x1p+0))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -0x1p+0) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const 0x1p+0) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "min" (f32.const -0x1p+0) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const -0x1p+0) (f32.const nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1p+0) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1p+0) (f32.const nan)))
 (assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x1.921fb6p+2))
 (assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const -0x1.921fb6p+2))
 (assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x0p+0))
@@ -1541,10 +1541,10 @@
 (assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const infinity)) (f32.const -0x1.921fb6p+2))
 (assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -infinity)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const infinity)) (f32.const 0x1.921fb6p+2))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const -0x1.921fb6p+2) (f32.const nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1.921fb6p+2) (f32.const nan)))
 (assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x1.fffffep+127))
 (assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const -0x1.fffffep+127))
 (assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x0p+0))
@@ -1577,10 +1577,10 @@
 (assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const infinity)) (f32.const -0x1.fffffep+127))
 (assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -infinity)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const infinity)) (f32.const 0x1.fffffep+127))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -0x1.fffffep+127) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const 0x1.fffffep+127) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "min" (f32.const -0x1.fffffep+127) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const -0x1.fffffep+127) (f32.const nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1.fffffep+127) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const 0x1.fffffep+127) (f32.const nan)))
 (assert_return (invoke "min" (f32.const -infinity) (f32.const -0x0p+0)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const -infinity) (f32.const 0x0p+0)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const infinity) (f32.const -0x0p+0)) (f32.const -0x0p+0))
@@ -1613,46 +1613,46 @@
 (assert_return (invoke "min" (f32.const -infinity) (f32.const infinity)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const infinity) (f32.const -infinity)) (f32.const -infinity))
 (assert_return (invoke "min" (f32.const infinity) (f32.const infinity)) (f32.const infinity))
-(assert_return (invoke "min" (f32.const -infinity) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -infinity) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "min" (f32.const infinity) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const infinity) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x0p+0)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x0p+0)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x0p+0)) (f32.const nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x0p+0)) (f32.const nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1p-149)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1p-149)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1p-149)) (f32.const nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1p-149)) (f32.const nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1p-126)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1p-126)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1p-126)) (f32.const nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1p-126)) (f32.const nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1p-1)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1p-1)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1p-1)) (f32.const nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1p-1)) (f32.const nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1p+0)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1p+0)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1p+0)) (f32.const nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1p+0)) (f32.const nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1.921fb6p+2)) (f32.const nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1.921fb6p+2)) (f32.const nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -0x1.fffffep+127)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const 0x1.fffffep+127)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const -0x1.fffffep+127)) (f32.const nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const 0x1.fffffep+127)) (f32.const nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -infinity)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const infinity)) (f32.const -nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const -infinity)) (f32.const nan))
-(assert_return (invoke "min" (f32.const nan) (f32.const infinity)) (f32.const nan))
-(assert_return (invoke "min" (f32.const -nan) (f32.const -nan)) (f32.const -nan))
+(assert_return_nan (invoke "min" (f32.const -infinity) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const -infinity) (f32.const nan)))
+(assert_return_nan (invoke "min" (f32.const infinity) (f32.const -nan)))
+(assert_return_nan (invoke "min" (f32.const infinity) (f32.const nan)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const -0x0p+0)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const 0x0p+0)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const -0x0p+0)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const 0x0p+0)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const -0x1p-149)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const 0x1p-149)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const -0x1p-149)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const 0x1p-149)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const -0x1p-126)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const 0x1p-126)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const -0x1p-126)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const 0x1p-126)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const -0x1p-1)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const 0x1p-1)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const -0x1p-1)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const 0x1p-1)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const -0x1p+0)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const 0x1p+0)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const -0x1p+0)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const 0x1p+0)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const -0x1.921fb6p+2)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const 0x1.921fb6p+2)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const -0x1.921fb6p+2)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const 0x1.921fb6p+2)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const -0x1.fffffep+127)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const 0x1.fffffep+127)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const -0x1.fffffep+127)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const 0x1.fffffep+127)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const -infinity)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const infinity)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const -infinity)))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const infinity)))
+(assert_return_nan (invoke "min" (f32.const -nan) (f32.const -nan)))
 (assert_return_nan (invoke "min" (f32.const -nan) (f32.const nan)))
 (assert_return_nan (invoke "min" (f32.const nan) (f32.const -nan)))
-(assert_return (invoke "min" (f32.const nan) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "min" (f32.const nan) (f32.const nan)))
 (assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
 (assert_return (invoke "max" (f32.const -0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -0x0p+0)) (f32.const 0x0p+0))
@@ -1685,10 +1685,10 @@
 (assert_return (invoke "max" (f32.const -0x0p+0) (f32.const infinity)) (f32.const infinity))
 (assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -infinity)) (f32.const 0x0p+0))
 (assert_return (invoke "max" (f32.const 0x0p+0) (f32.const infinity)) (f32.const infinity))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -0x0p+0) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const 0x0p+0) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "max" (f32.const -0x0p+0) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const -0x0p+0) (f32.const nan)))
+(assert_return_nan (invoke "max" (f32.const 0x0p+0) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const 0x0p+0) (f32.const nan)))
 (assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -0x0p+0)) (f32.const -0x0p+0))
 (assert_return (invoke "max" (f32.const -0x1p-149) (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -0x0p+0)) (f32.const 0x1p-149))
@@ -1721,10 +1721,10 @@
 (assert_return (invoke "max" (f32.const -0x1p-149) (f32.const infinity)) (f32.const infinity))
 (assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -infinity)) (f32.const 0x1p-149))
 (assert_return (invoke "max" (f32.const 0x1p-149) (f32.const infinity)) (f32.const infinity))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -0x1p-149) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const 0x1p-149) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "max" (f32.const -0x1p-149) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const -0x1p-149) (f32.const nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1p-149) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1p-149) (f32.const nan)))
 (assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -0x0p+0)) (f32.const -0x0p+0))
 (assert_return (invoke "max" (f32.const -0x1p-126) (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -0x0p+0)) (f32.const 0x1p-126))
@@ -1757,10 +1757,10 @@
 (assert_return (invoke "max" (f32.const -0x1p-126) (f32.const infinity)) (f32.const infinity))
 (assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -infinity)) (f32.const 0x1p-126))
 (assert_return (invoke "max" (f32.const 0x1p-126) (f32.const infinity)) (f32.const infinity))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -0x1p-126) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const 0x1p-126) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "max" (f32.const -0x1p-126) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const -0x1p-126) (f32.const nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1p-126) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1p-126) (f32.const nan)))
 (assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -0x0p+0)) (f32.const -0x0p+0))
 (assert_return (invoke "max" (f32.const -0x1p-1) (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -0x0p+0)) (f32.const 0x1p-1))
@@ -1793,10 +1793,10 @@
 (assert_return (invoke "max" (f32.const -0x1p-1) (f32.const infinity)) (f32.const infinity))
 (assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -infinity)) (f32.const 0x1p-1))
 (assert_return (invoke "max" (f32.const 0x1p-1) (f32.const infinity)) (f32.const infinity))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -0x1p-1) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const 0x1p-1) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "max" (f32.const -0x1p-1) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const -0x1p-1) (f32.const nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1p-1) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1p-1) (f32.const nan)))
 (assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
 (assert_return (invoke "max" (f32.const -0x1p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -0x0p+0)) (f32.const 0x1p+0))
@@ -1829,10 +1829,10 @@
 (assert_return (invoke "max" (f32.const -0x1p+0) (f32.const infinity)) (f32.const infinity))
 (assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -infinity)) (f32.const 0x1p+0))
 (assert_return (invoke "max" (f32.const 0x1p+0) (f32.const infinity)) (f32.const infinity))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -0x1p+0) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const 0x1p+0) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "max" (f32.const -0x1p+0) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const -0x1p+0) (f32.const nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1p+0) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1p+0) (f32.const nan)))
 (assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const -0x0p+0))
 (assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -0x0p+0)) (f32.const 0x1.921fb6p+2))
@@ -1865,10 +1865,10 @@
 (assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const infinity)) (f32.const infinity))
 (assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -infinity)) (f32.const 0x1.921fb6p+2))
 (assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const infinity)) (f32.const infinity))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const -0x1.921fb6p+2) (f32.const nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1.921fb6p+2) (f32.const nan)))
 (assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const -0x0p+0))
 (assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -0x0p+0)) (f32.const 0x1.fffffep+127))
@@ -1901,10 +1901,10 @@
 (assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const infinity)) (f32.const infinity))
 (assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -infinity)) (f32.const 0x1.fffffep+127))
 (assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const infinity)) (f32.const infinity))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -0x1.fffffep+127) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const 0x1.fffffep+127) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "max" (f32.const -0x1.fffffep+127) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const -0x1.fffffep+127) (f32.const nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1.fffffep+127) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const 0x1.fffffep+127) (f32.const nan)))
 (assert_return (invoke "max" (f32.const -infinity) (f32.const -0x0p+0)) (f32.const -0x0p+0))
 (assert_return (invoke "max" (f32.const -infinity) (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "max" (f32.const infinity) (f32.const -0x0p+0)) (f32.const infinity))
@@ -1937,46 +1937,46 @@
 (assert_return (invoke "max" (f32.const -infinity) (f32.const infinity)) (f32.const infinity))
 (assert_return (invoke "max" (f32.const infinity) (f32.const -infinity)) (f32.const infinity))
 (assert_return (invoke "max" (f32.const infinity) (f32.const infinity)) (f32.const infinity))
-(assert_return (invoke "max" (f32.const -infinity) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -infinity) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "max" (f32.const infinity) (f32.const -nan)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const infinity) (f32.const nan)) (f32.const nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x0p+0)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x0p+0)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x0p+0)) (f32.const nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x0p+0)) (f32.const nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1p-149)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1p-149)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1p-149)) (f32.const nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1p-149)) (f32.const nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1p-126)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1p-126)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1p-126)) (f32.const nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1p-126)) (f32.const nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1p-1)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1p-1)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1p-1)) (f32.const nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1p-1)) (f32.const nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1p+0)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1p+0)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1p+0)) (f32.const nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1p+0)) (f32.const nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1.921fb6p+2)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1.921fb6p+2)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1.921fb6p+2)) (f32.const nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1.921fb6p+2)) (f32.const nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -0x1.fffffep+127)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const 0x1.fffffep+127)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const -0x1.fffffep+127)) (f32.const nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const 0x1.fffffep+127)) (f32.const nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -infinity)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const infinity)) (f32.const -nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const -infinity)) (f32.const nan))
-(assert_return (invoke "max" (f32.const nan) (f32.const infinity)) (f32.const nan))
-(assert_return (invoke "max" (f32.const -nan) (f32.const -nan)) (f32.const -nan))
+(assert_return_nan (invoke "max" (f32.const -infinity) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const -infinity) (f32.const nan)))
+(assert_return_nan (invoke "max" (f32.const infinity) (f32.const -nan)))
+(assert_return_nan (invoke "max" (f32.const infinity) (f32.const nan)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const -0x0p+0)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const 0x0p+0)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const -0x0p+0)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const 0x0p+0)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const -0x1p-149)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const 0x1p-149)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const -0x1p-149)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const 0x1p-149)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const -0x1p-126)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const 0x1p-126)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const -0x1p-126)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const 0x1p-126)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const -0x1p-1)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const 0x1p-1)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const -0x1p-1)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const 0x1p-1)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const -0x1p+0)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const 0x1p+0)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const -0x1p+0)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const 0x1p+0)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const -0x1.921fb6p+2)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const 0x1.921fb6p+2)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const -0x1.921fb6p+2)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const 0x1.921fb6p+2)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const -0x1.fffffep+127)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const 0x1.fffffep+127)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const -0x1.fffffep+127)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const 0x1.fffffep+127)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const -infinity)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const infinity)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const -infinity)))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const infinity)))
+(assert_return_nan (invoke "max" (f32.const -nan) (f32.const -nan)))
 (assert_return_nan (invoke "max" (f32.const -nan) (f32.const nan)))
 (assert_return_nan (invoke "max" (f32.const nan) (f32.const -nan)))
-(assert_return (invoke "max" (f32.const nan) (f32.const nan)) (f32.const nan))
+(assert_return_nan (invoke "max" (f32.const nan) (f32.const nan)))
 (assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
 (assert_return (invoke "copysign" (f32.const -0x0p+0) (f32.const 0x0p+0)) (f32.const 0x0p+0))
 (assert_return (invoke "copysign" (f32.const 0x0p+0) (f32.const -0x0p+0)) (f32.const -0x0p+0))
diff --git a/ml-proto/test/f64.wast b/ml-proto/test/f64.wast
index df566fa54f..eb6e7da40a 100644
--- a/ml-proto/test/f64.wast
+++ b/ml-proto/test/f64.wast
@@ -1361,10 +1361,10 @@
 (assert_return (invoke "min" (f64.const -0x0p+0) (f64.const infinity)) (f64.const -0x0p+0))
 (assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -infinity)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const 0x0p+0) (f64.const infinity)) (f64.const 0x0p+0))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -0x0p+0) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const 0x0p+0) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "min" (f64.const -0x0p+0) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const -0x0p+0) (f64.const nan)))
+(assert_return_nan (invoke "min" (f64.const 0x0p+0) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const 0x0p+0) (f64.const nan)))
 (assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0.0000000000001p-1022))
 (assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const -0x0.0000000000001p-1022))
 (assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0p+0))
@@ -1397,10 +1397,10 @@
 (assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const infinity)) (f64.const -0x0.0000000000001p-1022))
 (assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -infinity)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const infinity)) (f64.const 0x0.0000000000001p-1022))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const -0x0.0000000000001p-1022) (f64.const nan)))
+(assert_return_nan (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const 0x0.0000000000001p-1022) (f64.const nan)))
 (assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x1p-1022))
 (assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (f64.const -0x1p-1022))
 (assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x0p+0))
@@ -1433,10 +1433,10 @@
 (assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const infinity)) (f64.const -0x1p-1022))
 (assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -infinity)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const infinity)) (f64.const 0x1p-1022))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -0x1p-1022) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const 0x1p-1022) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "min" (f64.const -0x1p-1022) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const -0x1p-1022) (f64.const nan)))
+(assert_return_nan (invoke "min" (f64.const 0x1p-1022) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const 0x1p-1022) (f64.const nan)))
 (assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -0x0p+0)) (f64.const -0x1p-1))
 (assert_return (invoke "min" (f64.const -0x1p-1) (f64.const 0x0p+0)) (f64.const -0x1p-1))
 (assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -0x0p+0)) (f64.const -0x0p+0))
@@ -1469,10 +1469,10 @@
 (assert_return (invoke "min" (f64.const -0x1p-1) (f64.const infinity)) (f64.const -0x1p-1))
 (assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -infinity)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const 0x1p-1) (f64.const infinity)) (f64.const 0x1p-1))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -0x1p-1) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const 0x1p-1) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "min" (f64.const -0x1p-1) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const -0x1p-1) (f64.const nan)))
+(assert_return_nan (invoke "min" (f64.const 0x1p-1) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const 0x1p-1) (f64.const nan)))
 (assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -0x0p+0)) (f64.const -0x1p+0))
 (assert_return (invoke "min" (f64.const -0x1p+0) (f64.const 0x0p+0)) (f64.const -0x1p+0))
 (assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
@@ -1505,10 +1505,10 @@
 (assert_return (invoke "min" (f64.const -0x1p+0) (f64.const infinity)) (f64.const -0x1p+0))
 (assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -infinity)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const 0x1p+0) (f64.const infinity)) (f64.const 0x1p+0))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -0x1p+0) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const 0x1p+0) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "min" (f64.const -0x1p+0) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const -0x1p+0) (f64.const nan)))
+(assert_return_nan (invoke "min" (f64.const 0x1p+0) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const 0x1p+0) (f64.const nan)))
 (assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x1.921fb54442d18p+2))
 (assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const -0x1.921fb54442d18p+2))
 (assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x0p+0))
@@ -1541,10 +1541,10 @@
 (assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const infinity)) (f64.const -0x1.921fb54442d18p+2))
 (assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -infinity)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const infinity)) (f64.const 0x1.921fb54442d18p+2))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)))
+(assert_return_nan (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)))
 (assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x1.fffffffffffffp+1023))
 (assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const -0x1.fffffffffffffp+1023))
 (assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x0p+0))
@@ -1577,10 +1577,10 @@
 (assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const infinity)) (f64.const -0x1.fffffffffffffp+1023))
 (assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -infinity)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const infinity)) (f64.const 0x1.fffffffffffffp+1023))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)))
+(assert_return_nan (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)))
 (assert_return (invoke "min" (f64.const -infinity) (f64.const -0x0p+0)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const -infinity) (f64.const 0x0p+0)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const infinity) (f64.const -0x0p+0)) (f64.const -0x0p+0))
@@ -1613,46 +1613,46 @@
 (assert_return (invoke "min" (f64.const -infinity) (f64.const infinity)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const infinity) (f64.const -infinity)) (f64.const -infinity))
 (assert_return (invoke "min" (f64.const infinity) (f64.const infinity)) (f64.const infinity))
-(assert_return (invoke "min" (f64.const -infinity) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -infinity) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "min" (f64.const infinity) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const infinity) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x0p+0)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x0p+0)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x0p+0)) (f64.const nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x0p+0)) (f64.const nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x1p-1022)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x1p-1022)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x1p-1022)) (f64.const nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x1p-1022)) (f64.const nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x1p-1)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x1p-1)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x1p-1)) (f64.const nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x1p-1)) (f64.const nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x1p+0)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x1p+0)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x1p+0)) (f64.const nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x1p+0)) (f64.const nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -infinity)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const infinity)) (f64.const -nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const -infinity)) (f64.const nan))
-(assert_return (invoke "min" (f64.const nan) (f64.const infinity)) (f64.const nan))
-(assert_return (invoke "min" (f64.const -nan) (f64.const -nan)) (f64.const -nan))
+(assert_return_nan (invoke "min" (f64.const -infinity) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const -infinity) (f64.const nan)))
+(assert_return_nan (invoke "min" (f64.const infinity) (f64.const -nan)))
+(assert_return_nan (invoke "min" (f64.const infinity) (f64.const nan)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const -0x0p+0)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const 0x0p+0)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const -0x0p+0)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const 0x0p+0)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const -0x0.0000000000001p-1022)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const 0x0.0000000000001p-1022)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const -0x1p-1022)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const 0x1p-1022)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const -0x1p-1022)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const 0x1p-1022)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const -0x1p-1)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const 0x1p-1)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const -0x1p-1)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const 0x1p-1)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const -0x1p+0)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const 0x1p+0)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const -0x1p+0)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const 0x1p+0)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const -infinity)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const infinity)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const -infinity)))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const infinity)))
+(assert_return_nan (invoke "min" (f64.const -nan) (f64.const -nan)))
 (assert_return_nan (invoke "min" (f64.const -nan) (f64.const nan)))
 (assert_return_nan (invoke "min" (f64.const nan) (f64.const -nan)))
-(assert_return (invoke "min" (f64.const nan) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "min" (f64.const nan) (f64.const nan)))
 (assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
 (assert_return (invoke "max" (f64.const -0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -0x0p+0)) (f64.const 0x0p+0))
@@ -1685,10 +1685,10 @@
 (assert_return (invoke "max" (f64.const -0x0p+0) (f64.const infinity)) (f64.const infinity))
 (assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -infinity)) (f64.const 0x0p+0))
 (assert_return (invoke "max" (f64.const 0x0p+0) (f64.const infinity)) (f64.const infinity))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -0x0p+0) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const 0x0p+0) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "max" (f64.const -0x0p+0) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const -0x0p+0) (f64.const nan)))
+(assert_return_nan (invoke "max" (f64.const 0x0p+0) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const 0x0p+0) (f64.const nan)))
 (assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const -0x0p+0))
 (assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -0x0p+0)) (f64.const 0x0.0000000000001p-1022))
@@ -1721,10 +1721,10 @@
 (assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const infinity)) (f64.const infinity))
 (assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -infinity)) (f64.const 0x0.0000000000001p-1022))
 (assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const infinity)) (f64.const infinity))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const -0x0.0000000000001p-1022) (f64.const nan)))
+(assert_return_nan (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const 0x0.0000000000001p-1022) (f64.const nan)))
 (assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -0x0p+0)) (f64.const -0x0p+0))
 (assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -0x0p+0)) (f64.const 0x1p-1022))
@@ -1757,10 +1757,10 @@
 (assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const infinity)) (f64.const infinity))
 (assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -infinity)) (f64.const 0x1p-1022))
 (assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const infinity)) (f64.const infinity))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -0x1p-1022) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const 0x1p-1022) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "max" (f64.const -0x1p-1022) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const -0x1p-1022) (f64.const nan)))
+(assert_return_nan (invoke "max" (f64.const 0x1p-1022) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const 0x1p-1022) (f64.const nan)))
 (assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -0x0p+0)) (f64.const -0x0p+0))
 (assert_return (invoke "max" (f64.const -0x1p-1) (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -0x0p+0)) (f64.const 0x1p-1))
@@ -1793,10 +1793,10 @@
 (assert_return (invoke "max" (f64.const -0x1p-1) (f64.const infinity)) (f64.const infinity))
 (assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -infinity)) (f64.const 0x1p-1))
 (assert_return (invoke "max" (f64.const 0x1p-1) (f64.const infinity)) (f64.const infinity))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -0x1p-1) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const 0x1p-1) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "max" (f64.const -0x1p-1) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const -0x1p-1) (f64.const nan)))
+(assert_return_nan (invoke "max" (f64.const 0x1p-1) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const 0x1p-1) (f64.const nan)))
 (assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
 (assert_return (invoke "max" (f64.const -0x1p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -0x0p+0)) (f64.const 0x1p+0))
@@ -1829,10 +1829,10 @@
 (assert_return (invoke "max" (f64.const -0x1p+0) (f64.const infinity)) (f64.const infinity))
 (assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -infinity)) (f64.const 0x1p+0))
 (assert_return (invoke "max" (f64.const 0x1p+0) (f64.const infinity)) (f64.const infinity))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -0x1p+0) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const 0x1p+0) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "max" (f64.const -0x1p+0) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const -0x1p+0) (f64.const nan)))
+(assert_return_nan (invoke "max" (f64.const 0x1p+0) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const 0x1p+0) (f64.const nan)))
 (assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const -0x0p+0))
 (assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -0x0p+0)) (f64.const 0x1.921fb54442d18p+2))
@@ -1865,10 +1865,10 @@
 (assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const infinity)) (f64.const infinity))
 (assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -infinity)) (f64.const 0x1.921fb54442d18p+2))
 (assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const infinity)) (f64.const infinity))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const -0x1.921fb54442d18p+2) (f64.const nan)))
+(assert_return_nan (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const 0x1.921fb54442d18p+2) (f64.const nan)))
 (assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const -0x0p+0))
 (assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -0x0p+0)) (f64.const 0x1.fffffffffffffp+1023))
@@ -1901,10 +1901,10 @@
 (assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const infinity)) (f64.const infinity))
 (assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -infinity)) (f64.const 0x1.fffffffffffffp+1023))
 (assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const infinity)) (f64.const infinity))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const -0x1.fffffffffffffp+1023) (f64.const nan)))
+(assert_return_nan (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const 0x1.fffffffffffffp+1023) (f64.const nan)))
 (assert_return (invoke "max" (f64.const -infinity) (f64.const -0x0p+0)) (f64.const -0x0p+0))
 (assert_return (invoke "max" (f64.const -infinity) (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "max" (f64.const infinity) (f64.const -0x0p+0)) (f64.const infinity))
@@ -1937,46 +1937,46 @@
 (assert_return (invoke "max" (f64.const -infinity) (f64.const infinity)) (f64.const infinity))
 (assert_return (invoke "max" (f64.const infinity) (f64.const -infinity)) (f64.const infinity))
 (assert_return (invoke "max" (f64.const infinity) (f64.const infinity)) (f64.const infinity))
-(assert_return (invoke "max" (f64.const -infinity) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -infinity) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "max" (f64.const infinity) (f64.const -nan)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const infinity) (f64.const nan)) (f64.const nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x0p+0)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x0p+0)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x0p+0)) (f64.const nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x0p+0)) (f64.const nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x0.0000000000001p-1022)) (f64.const nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x0.0000000000001p-1022)) (f64.const nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x1p-1022)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x1p-1022)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x1p-1022)) (f64.const nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x1p-1022)) (f64.const nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x1p-1)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x1p-1)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x1p-1)) (f64.const nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x1p-1)) (f64.const nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x1p+0)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x1p+0)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x1p+0)) (f64.const nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x1p+0)) (f64.const nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)) (f64.const nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)) (f64.const nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)) (f64.const nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)) (f64.const nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -infinity)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const infinity)) (f64.const -nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const -infinity)) (f64.const nan))
-(assert_return (invoke "max" (f64.const nan) (f64.const infinity)) (f64.const nan))
-(assert_return (invoke "max" (f64.const -nan) (f64.const -nan)) (f64.const -nan))
+(assert_return_nan (invoke "max" (f64.const -infinity) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const -infinity) (f64.const nan)))
+(assert_return_nan (invoke "max" (f64.const infinity) (f64.const -nan)))
+(assert_return_nan (invoke "max" (f64.const infinity) (f64.const nan)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const -0x0p+0)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const 0x0p+0)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const -0x0p+0)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const 0x0p+0)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const -0x0.0000000000001p-1022)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const 0x0.0000000000001p-1022)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const -0x0.0000000000001p-1022)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const 0x0.0000000000001p-1022)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const -0x1p-1022)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const 0x1p-1022)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const -0x1p-1022)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const 0x1p-1022)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const -0x1p-1)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const 0x1p-1)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const -0x1p-1)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const 0x1p-1)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const -0x1p+0)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const 0x1p+0)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const -0x1p+0)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const 0x1p+0)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const -0x1.921fb54442d18p+2)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const 0x1.921fb54442d18p+2)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const -0x1.921fb54442d18p+2)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const 0x1.921fb54442d18p+2)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const -0x1.fffffffffffffp+1023)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const 0x1.fffffffffffffp+1023)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const -0x1.fffffffffffffp+1023)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const 0x1.fffffffffffffp+1023)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const -infinity)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const infinity)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const -infinity)))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const infinity)))
+(assert_return_nan (invoke "max" (f64.const -nan) (f64.const -nan)))
 (assert_return_nan (invoke "max" (f64.const -nan) (f64.const nan)))
 (assert_return_nan (invoke "max" (f64.const nan) (f64.const -nan)))
-(assert_return (invoke "max" (f64.const nan) (f64.const nan)) (f64.const nan))
+(assert_return_nan (invoke "max" (f64.const nan) (f64.const nan)))
 (assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))
 (assert_return (invoke "copysign" (f64.const -0x0p+0) (f64.const 0x0p+0)) (f64.const 0x0p+0))
 (assert_return (invoke "copysign" (f64.const 0x0p+0) (f64.const -0x0p+0)) (f64.const -0x0p+0))