Harry Potter Partway Thoughts - In Snape's Memories

(Semi-spoiler alert. I'm up to page 685. Read further AYOR.) When V was sitting in the Shrieking Shack fretting about his wand, it occurred to me that Snape pulled a switcheroo when D was buried, and that wasn't the real Elder Wand buried with him. Now it just hit me - is that what's in the Snitch?