Make coverage checking more robust.