more unification of the various types

The Async server is still not using Conduit.Server since it's a
more complex type to override, so this will change in the future.