Watchpoints patch

This should fix watch points. The key place it will be wrong, if it is, is in `WatchpointManager.cpp` -- it seems sane to me, but could you have a look?