The 1954 definition well describes the kind of song most valued and sought after by collectors.

The encyclopedia definitions describe how the word is used by more recent scholars.

For better or worse, it subsumes the 1954 kind of song.

And the current popular definition subsumes the others in a kind of notional slurry - much the same substance one often encounters in the criticism of art, music, and literature.

It seems inevitable.