More Watchpoint support.
3 files changed