REL-1501: Made changes as recommended: unsued variable removed and thread-safe access to watchers.