Make cif reader more robust.