Fix packages with pluses and dots in them (-i).