Improve performance by only updating expr.expression when new expression
is selected.