ENH: more distro abstraction