More Types2 removal

Specifically, this is what's needed to get rid of the types and expression directories to make way for a types3 rename.

It does not get rid of AkType, just moves it out of the way.