Bug #1697782: remove all remaining code that uses types.InstanceType.
8 files changed