Preserve the ignore count when we resolve a pending breakpoint. Also add