Change expression decomposition variant to do single evaluation of expression.