Simplify the policy_changed/2 code