Make --keepfiles options consistent