Branwen- It's real hard to tell from from the book. Mostly because Rickaby did not include a tune for his version "A". He has tunes for versions B and C and also has a version D tune with no lyrics but a first verse. What you suggest is certainly an option. I think more frequently in these situations the last two lines of the tune would be repeated.

rich r