There are other places in this code that can benefit from a similar transform, such as all the places you say `if cond { self.expect = foo; } else { self.expect = bar; }`. But I'm not going to point them out individually. And as I said, what you have here is fine if you want to leave it as-is, I just have a personal preference for the style I mentioned previously.