Yet more robustness for cif cleaning.