Improve do-instance-tagged-slot