Drop internal uses of .type on the class