Make Expect throw ComparisonFailure when possible

Currently, it always throws `AssertionError`. But if there's only one failure and it's a `ComparisonFailure`, we should throw `ComparisonFailure`. Arguably we could throw `ComparisonFailure` even in the case of multiple failures, at least if only one input is a `ComparisonFailure`, though that's potentially confusing.