Reverted change of parse_iff params