TypeDefs cleanup.