Server: Don't do two tests where one suffices.