Some stability work

Works with many more items now and breaks less trying to retrofit double
mod affixes.