Some evaluation code reshuffle

No functional change.