Partial move to MonadSource/Conduit/Sink