And clean up detection logic a bit. We also don't
read /etc/lsb-release manually more, since it's format is
not specified.