Display diversity with retro-compatibility

Diversity is now output under an Array by (see #1941 (closed)) but this was not the case previously. We deal with both possibilities.

Fixes #3416 (closed)