Better handling of picking up items with unarmed.