simplify expression handling