Add support for recursive Watchpoints