Watch state management cleanup, organization, simplification, and
improvement. Improved disconnect and exit.