While working on a seperate bug I saw in memberenrtygen.tt we will use both borrower_data ( borrower_data.surname ) and patron ( patron.contactname ). Do we need both? Or can we remove borrower_data in favor of patron?