Walter, those are logical niceties, but the NG has his words as published, as far as I can see: in John Manifold's Penguin Australian Song Book, the "Marie Cowan" version makes your corrections, but Manifold notes the words are "considerable altered from A. B. Paterson", and the tune is different, too -- it's the one in modern currency.

~ Becky in Tucson