These are some spurious fixes to help illustrate the improved ergonomics of the `expectEqual` change. It is by no means complete.