Yes it has. And, I say it all over the place so your pardon if you've heard me say it, knowing what happens won't ruin my enjoyment of the scene. Someone in my family spoiled HP6 for me, but I didn't find the scene any less touching. It still made me cry. So knowing the what doesn't detract from the how, at least not for me.
And you're lucky! My mom drinks entirely too much wine, but my beer and hard alcohol seem to horrify her. I've never been able to figure that one out. Meh.