A couple changes in delete_file() make us more compatible with