Changes to deal with .path files with hyphenated names, eg apt-get.path