Refactor mail-merge slightly