Update code for element and property watchers.