It would probably be good to try and migrate the common case out of policies and into repos: scan the policy table, find every repo referenced, and if all the references use the same task set that in the repo, and then remove it from the policy table entirely.