Sounds good, done in 39768be.

The only case *not* covered is if there are duplicate track numbers on a single medium (i.e. nothing to disambiguate with). But I'm guessing that's an exceptionally rare case.