Fix up and simplify Server-Sent-Events interface