Oops -- ye're quite right about the version. Mexico is part of Dylan's re-write. Doesn't appear in the trad version.

I think over the years I had melded them in my spongy brain.

A