Switch from CommonState to StoredState if we switch the watches.