Make sure that we also trigger variable watches when a variable is set in the parent scope. Fixes: #17827