Finished conversion to usage of IHasType.