Cleanup in types package.