Minor changes.

Removed avoidable watches.