[musicdb] fix some problems with non-musicbrainz albums in scanner, and tidy up some of the scanner overall.