Anoter try to make +- behave sanely.