Turns out it was bens patch and not mine after all which caused this.
But I wrote up a fix nevertheless.
@simonpj @bgamari