Update to use generic WebSocketHandler

Refactor for upstream changes.