Fix up tests.

tests/issues/issue058.icry.stdout

@@ -8,8 +8,8 @@ Loading module Main
       for any type n
       fin n
         arising from
-        use of literal or demoted expression
-        at ./issue058.cry:4:15--4:16
+        use of expression (!=)
+        at ./issue058.cry:4:10--4:16
 [error] at ./issue058.cry:7:1--7:17:
   Failed to validate user-specified signature.
     In the definition of 'Main::last', at ./issue058.cry:7:1--7:5:

tests/issues/issue198.icry.stdout

@@ -15,5 +15,5 @@ Loading module Main
   Defaulting type parameter 'bits'
              of literal or demoted expression
              at ./simon.cry2:89:36--89:38
-  to max 6 (max (width (a`570 - 1)) (width a`569))
+  to max 6 (max (width a`569) (width (a`570 - 1)))
 True

tests/issues/issue226.icry.stdout

@@ -13,8 +13,8 @@ Symbols
 =======
     (!) : {a, b, c} (fin a, fin c) => [a]b -> [c] -> b
     (!!) : {a, b, c, d} (fin a, fin d) => [a]b -> [c][d] -> [c]b
-    (!=) : {a} (Cmp a) => a -> a -> Bool
-    (!==) : {a, b} (Cmp b) => (a -> b) -> (a -> b) -> a -> Bool
+    (!=) : {a} (Cmp a) => a -> a -> Bit
+    (!==) : {a, b} (Cmp b) => (a -> b) -> (a -> b) -> a -> Bit
     (#) : {front, back,
            a} (fin front) => [front]a -> [back]a -> [front + back]a
     (%) : {a} (Arith a) => a -> a -> a
@@ -23,14 +23,14 @@ Symbols
     (+) : {a} (Arith a) => a -> a -> a
     (-) : {a} (Arith a) => a -> a -> a
     (/) : {a} (Arith a) => a -> a -> a
-    (<) : {a} (Cmp a) => a -> a -> Bool
+    (<) : {a} (Cmp a) => a -> a -> Bit
     (<<) : {a, b, c} (fin b) => [a]c -> [b] -> [a]c
     (<<<) : {a, b, c} (fin a, fin b) => [a]c -> [b] -> [a]c
-    (<=) : {a} (Cmp a) => a -> a -> Bool
-    (==) : {a} (Cmp a) => a -> a -> Bool
-    (===) : {a, b} (Cmp b) => (a -> b) -> (a -> b) -> a -> Bool
-    (>) : {a} (Cmp a) => a -> a -> Bool
-    (>=) : {a} (Cmp a) => a -> a -> Bool
+    (<=) : {a} (Cmp a) => a -> a -> Bit
+    (==) : {a} (Cmp a) => a -> a -> Bit
+    (===) : {a, b} (Cmp b) => (a -> b) -> (a -> b) -> a -> Bit
+    (>) : {a} (Cmp a) => a -> a -> Bit
+    (>=) : {a} (Cmp a) => a -> a -> Bit
     (>>) : {a, b, c} (fin b) => [a]c -> [b] -> [a]c
     (>>>) : {a, b, c} (fin a, fin b) => [a]c -> [b] -> [a]c
     (@) : {a, b, c} (fin c) => [a]b -> [c] -> b

tests/mono-binds/test03.icry.stdout

@@ -9,8 +9,8 @@ test03::test = \{a} (fin a, a >= width a) ->
                foo a <> <>
                where
                  /* Not recursive */
-                 foo : {b} (b >= width a, fin b) => [b]
-                 foo = \{b} (b >= width a, fin b) -> Cryptol::demote a b <> <> <>
+                 foo : {b} (fin b, b >= width a) => [b]
+                 foo = \{b} (fin b, b >= width a) -> Cryptol::demote a b <> <> <>