Cleaned up ShellWebSocket a bit more.