Instead of relying on the shortname, just pass the song pointer
to prevent redundant lookups during deletes.