This change fixes up remaining imports related to type checking, moving

a bunch of things into if TYPE_CHECKING blocks, importing from more

modern locations (e.g. collections.abc instead of typing), and

generally cleaning up.

Ran unit tests.