Ah, you're right. But then the current patch doesn't feel like a simplification of the existing code, I guess, since it adds more lines and more branches but doesn't change any behavior (or does it?).