Well, clearly, Dusterian, the Estonian tale is NOT a version of Rapunzel, as my synopsis indicated. Actually, having gone back & checked Andrew Lang who reproduced the Estonian tale in his Violet Fairy Book, I see it was a creepy old man and not a witch in that version, and it plays out differently ...

I'm sorry they've seen fit not to call the movie 'Rapunzel' but it may be that the title 'Tangled' is more apt than we have realised. My understanding was that they solved the story problems that the basic Rapunzel mythos was giving them by conflating the Rapunzel story with a separate Estonian fair...