Improve readability of ComparisonFailure

Continuation of #851 with squashed commits.