watch expression handling improved