A few fixes for unequippable cross-class item state.