Debugger: Fix watchpoints triggering too late