Improve readability of ComparisonFailure

@kcooney Continuation of #851 with squashed commits.