Fix expression evaluation.