Incorporate conversion to +-> notation done by Martin Rubey.
Lisp file has no regression. Only one appearance of #1 has been left open.
Authored by: hemmecke 2009-04-05
Parent: [r571]
Child: [r573]