Tidy up.
Stable reworking of playlist handling.