deftype -> def-*-type; defvariant -> def-variant