Bug 1089718 - [music] Make the metadata parser sane

Ok, I'm going to revert the revert I did because that magically squashes everything!