6e27ef8ff9
There's really no reason to do it this way: it works in both cases, and it's a lot simpler to reason about.