Try to fix spurious 002.cf test failures.