More work on affixes and items.