Ah, I do so love it when Snape gets all stupidly egotistical in his protection of Harry -- he calls Harry a martyr, but really it's usually him climbing the crosses and calling for the hammer, isn't it?
This resolution was nice, too. All the more so for its taking place in front of an entire class of Harry's peers. Delightfully raw. SO well done!