attach_and_activate no longer needs xc

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
Add TODO comments for remaining 'with_xc' calls

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>