Fix all references to Item::type, allowing us to compile now.  Way easier than I thought!