Turns out that when I wrote a test to simulate this, your patch did what I expected :)