Start of a neater way to wait for /events-stream events to happen - so far just one outstanding