There's something about this Bach album where the title and every
track has a hyphen that causes MPD to send each clause as a separate
lines. Stitch them back together.

Remove unused references to firestring.