Consolidating data needed for contact aggregator into the data1 and data2 fields.

The aggregator will then only read data1 and
data2 and do the matching on those (taking mime type into account, of course).