Get the right uri to check websocket upgrade request against, tidy todos...