If there is a timeout, just keep waiting.

Simple change to support watch without timing out. Perhaps watch itself needs an explicit timeout? It would think that would be distinct from the normal one though, and should definitely support "unlimited".