Move some conduit-extra functionality into conduit itself