Handle single plus and minus signs better.