@@ -34,16 +34,15 @@ data CC s = CC !s {-# UNPACK #-} !Char {-# UNPACK #-} !Char
3434
3535-- | Specialised, strict Maybe-like type.
3636data M a = N
37− | J {-# UNPACK #-} !a
37+ | J !a
3838
3939type M8 = M Word8
4040
4141-- Restreaming state.
42−data S s = S {-# UNPACK #-} !s
43− {-# UNPACK #-} !M8 {-# UNPACK #-} !M8 {-# UNPACK #-} !M8
42+data S s = S !s {-# UNPACK #-} !M8 {-# UNPACK #-} !M8 {-# UNPACK #-} !M8
4443
4544infixl 2 :*:
46−data PairS a b = {-# UNPACK #-} !a :*: {-# UNPACK #-} !b
45+data PairS a b = !a :*: !b
4746 deriving (Eq, Ord, Show)
4847
4948-- | Allow a function over a stream to switch between two states.