Keep up with close/error semantics

And show the expected shape of callbacks.