SECURITY: Improve cross-domain-policy mangling