Bug 1097579 - Refactor Multicontact code to prepare it for contacts datastore implementation

...
Since we are using it everywhere, use fat arrow also here as well, please