simplify domain_source a bit