Modenise dependencies

Should work with GHC v7.8 now.