Make the output of the cluster check more readable.

Fixes #6299