Multiple clients/sessions over a WebSocket (2)

This is #230 with some fixes.