This patch uses the new helper to avoid the more complex check for
domain state modification flags.