You have great taste. I know that Wait 'Til I Put On My Robe, was something Geoff picked up from, as I recall, a gospel duo who used to sing on the streets of Los Angeles -- I may have garbled the story. But his diction on that tune is pretty clear, and the words have been used in several other songs: "Jordan River is chilly and cold, chills the body but not the soul, etc." As for the other, I can't call it to mind at the moment.
I wish more people would be aware of just how great Geoff is nowadays -- better than ever, and that's saying something.