Made me chuckle then, makes me chuckle now!
This was what cemented McGonagall as one of my favourite characters in the series