Add a type abbreviation and redo first pass of collect_item_types to collect across the whole crate, not just top level.