Use upstream effectful, as I don't think we'll need to customize it.
Decruft a bit.