If we're thinking of who else might have been in Hermione's place, McGonagall only kind of fits:

"There was a burst of something that was magic and also more, a shout louder than an earthquake and containing a thousand books, a thousand libraries, all spoken in a single cry that was Hermione; too vast to be understood, except that Harry suddenly knew that Hermione had whited out the pain, and was glad not to be dying alone."

That's a very Ravenclaw way to die. Who fits better?