Joe Offer: The Hymnal 1940 version agrees almost with the version I learned in elementary school, except that, weirdly, the verb forms have been modernized without abandoning "Thou". Surely it has to be, as I remember it, "Thou, Lord, wast at our side" and "And pray that Thou still our defender wilt be".

Oh, and I learned "Our leader in battle" instead of "Our Leader triumphant". If "battle" sounded too combative, the reviser should have done something about "fight" as well.