And while at it, make it easier to work with distribution names with
less if statements and more case matching.

Better diff with the --ignore-all-space option.