chore(scope): remove watchSet API
feat(scope): Allow expressions on non-scope context
chore(demo): update to work with new scope