fix watches. all cells fully support IWatchable now.