domain: WIP further simplify code

A little flattening will help me see how to break this out of core.