Update for modern Haskell.