make-generic-type -> generic-type
typeof -> type