Small changes to the MailMergeData class.