Bug 1089718 - [music] Make the metadata parser sane

I cleaned this up.