Reduce the usage of the types module.
8 files changed