A few more places needed to handle CPU_WHICH_DOMAIN.