-i: handle packages with pluses in them.