Further simplification in evaluate

No functional change
Merge remote-tracking branch 'upstream/master'