Replace define-type with the simpler define-structure