Nice to see this discussion here. I’ve been thinking about this exact point

My introduction to the song is Garcia/Grisman (1:12:00 in this video). I thought Garcia sang “where ‘Ma still’ lies buried close by” which I think fits the best of what I’ve heard.

I like keeping Massa. It gives the song a much deeper meaning in my opinion. I’m adopting the concept that it’s a slave song about leaving one’s home to escape - and though the slave is free, still they have regrets about leaving “home” even if it was in servitude. Life’s complicated and I think the song speaks to that.