If we switch the map control vars to StoredState, we won't need to duplicate watches on CommonState.