Exorcise ZF1 from these files too.