Changes s.t. arithmetics work with  and undefined vars