Ensure prior scope was updated when changing scope values.

Current spec status: 548 examples, 0 failures in 4.33 seconds.