deftype improvements