Remove more with_xc calls, and annotate the remaining work

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
Refactoring: remove separate Domain module (and some ws changes)

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