Consolidate WebSocketHandler interface and sub-interfaces