GUI-337: Prep work for adding conditions to a policy statement