Extended attach() and detach().

Previously the functions knew how to handle any indiator passed in for
attachment or detachment.

Now the functions also know how to handle indiator wrappers.