Very interesting. I can see how the previous code would leave watches around. This is a very big change though. I'll run the tests with it and think about edge cases.