Correct '+' expansion handling. This makes expansion work.