Remove boxed_typ.
Break typ recursion up a bit.