Polish: better progress display in presence of buggy headers.
Cache known conflicts and test them first on subsequent conflict-test passes.

This speeds up testing on OSX from 6m40s to 5m3s (wall time).