Updated types for conduit-1.0.5, plus some tidying up as suggested by hlint.