This completes the bug fix commit
2065e329; if we clear "queued" then we
must clear "queued_song" as well, or another variant of the assertion
fails.