Joe, I used to do the song as learned from Baez and my recollection of the words agrees with yours — for what that's worth.....

david