The long time was short ;)
Not really a big change, just drop the TypeVar (TypeVar sucks really)