Cut some fat off of Item.h