WatcherElement reference should be nulled by caller of removeClient rather than withi...