Refactors to new(options).deliver(msg)

It's more sane.