Add handling for armor replacement when a non-armor item (e.g. skulls) is worn.