Fix incorrectly removed types in `TypeLookup`
340 files changed