Added operator collapsing (++->+, -- -> +) in expression solver