[Evaluation] Separated expression type from value evaluation. Now regression fixing.