[unrelated] improve eval diagnostics
3 files changed