Fix up scrubbing pull requests.

We were scrubbing all pull requests too often.
Make sure fetch_ci_tracking does The Right Thing.