Tolerate multiple watch/unwatch calls...

Return value indicates if watch/unwatch was successful.