Embed watches in scope + simplify.