Fixes a bad conflict resolution introduced in 439851e9 (Expression parser and evaluator, 2020-12-14).