ah ok, you're right it's already (Id, Entity)
(Sometimes I wonder whether I write my own code...)