Ah, I see. As I was writing the comment, I thought it might be something along those lines. I can rebase if you want to merge the other commit.