Added support for recursive watchpoints deletion