Make $E annotations mode-specific.

Also improve readability of output.