Simplify choice expressions computation