Bug 1039465 - [Contacts DataRefactor] Tweak global_contacts_data module ...

...and multi_contact
This looked more complex because we generalised `getEntry` in the comment above. It's fine to leave it as it is, though.