Update to build in more-modern Haskell environs