Comigrate: more robust handling of faux packages