Get rid of update_watchers in favor of watching committed_state and latest_state.
Fix bug in previous commit.