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

...
Did you copy&paste? :P