Maybe I had just forgotten the details from WWDC, but iTunes Match is even better than I was expecting.