I like that ending. You could have dragged it out, but truthfully seeing a Harry that was smart enough to get out when he was no longer really needed was refreshing.
"Harry, you've got boulders for balls," Neville said, awed.
"Really?" Luna asked, interested.
"Metaphor," Hermione hissed. Luna pouted.
LOL!
Just had to laugh at that one more time.