hunk ./benchmarks/Sound/OSC/NFData.hs 7
-    rnf (Int x1)        = rnf x1 `seq` ()
-    rnf (Float x1)      = rnf x1 `seq` ()
-    rnf (Double x1)     = rnf x1 `seq` ()
-    rnf (String x1)     = rnf x1 `seq` ()
-    rnf (Blob x1)       = rnf x1 `seq` ()
-    rnf (TimeStamp x1)  = rnf x1 `seq` ()
-    rnf (Midi x1)       = rnf x1 `seq` ()
+    rnf (Int32 x1) = rnf x1 `seq` ()
+    rnf (Float x1) = rnf x1 `seq` ()
+    rnf (Double x1) = rnf x1 `seq` ()
+    rnf (ASCII_String x1) = rnf x1 `seq` ()
+    rnf (Blob x1) = rnf x1 `seq` ()
+    rnf (TimeStamp x1) = rnf x1 `seq` ()
+    rnf (Midi x1) = rnf x1 `seq` ()
+
+instance NFData MIDI where
+    rnf (MIDI x1 x2 x3 x4) = rnf x1 `seq` rnf x2 `seq` rnf x3 `seq` rnf x4 `seq` ()
hunk ./benchmarks/benchmark.hs 27
-        m = Message "/fooblah" [Float 42
-                               ,Int 16
-                               ,String "yeah"
+        m = Message "/fooblah" [Float 42.0
+                               ,Int32 16
+                               ,string "yeah"
hunk ./tests/Sound/OSC/Arbitrary.hs 4
+import qualified Data.ByteString.Char8 as C {- bytestring -}
hunk ./tests/Sound/OSC/Arbitrary.hs 10
-genTime :: Gen Time
hunk ./tests/Sound/OSC/Arbitrary.hs 11
+genTime :: Gen Time
hunk ./tests/Sound/OSC/Arbitrary.hs 17
+genASCII :: Gen ASCII
+genASCII = fmap C.pack genString
+
+genMIDI :: Gen MIDI
+genMIDI = do
+  (p,q,r,s) <- arbitrary
+  return (MIDI p q r s)
+
hunk ./tests/Sound/OSC/Arbitrary.hs 27
-        Int       <$> arbitrary
-      , Float     <$> realToFrac <$> (arbitrary :: Gen Float)
-      , Double    <$> arbitrary
-      , String    <$> genString
-      , Blob      <$> B.pack <$> resize 128 arbitrary
+        Int32 <$> arbitrary
+      , Float <$> realToFrac <$> (arbitrary :: Gen Float)
+      , Double <$> arbitrary
+      , ASCII_String <$> genASCII
+      , Blob <$> B.pack <$> resize 128 arbitrary
hunk ./tests/Sound/OSC/Arbitrary.hs 33
-      , Midi      <$> arbitrary
+      , Midi <$> genMIDI