Broke away from gentype.h