Further simplification in evaluate

No functional change