Finish converting ConcreteItemManager to use Sets instead of Collections