Reformat of eval tracing code

Also assorted rename while there.

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