Tidied this up to use existing implementation of ``MediaRange.Matches`` rather than re-inventing the same logic.