The description in this PR doesn't describe thing well--what's really happening is that if the condition associated with a watchpoint contained a function call, it resulted in a segfault. This patch fixes that.