Simplify Distribution tagging.
Remove stray DescPackaging