Isn't it just, though? River would wear a fake mustache, I think. For giggles.

McGonagall <3 Adore her, especially in the books. Was tempted to add appendices for her. And Luna. And Neville. And . . . well, a great number of the characters who are not Harry, Ron, and Hermione. But concision is funnier.