http-conduit: tidy up code a bit