Ah, yes, I wondered why that id magic was in there. Will update in my branch.