I need to re-read the battle scene. I was pushing to get through and totally missed Tonks and Lupin.
And, how did Neville get the sword?
Tonks and Lupin were easy to miss. Very off-screen.
Neville pulled the sword from the Sorting Hat, just like Harry in CoS, because he is a true Gryffindor.
I can see how that could be. They were mentioned as being on the floor of the Great Hall. After learning about Fred, knowing they were gone too just did me in. Didn't even make the connection between Harry who was going to be Godfather of an orphan as Sirius was to him.