CDDB#matches: minor refactoring