Optimisations

...optimisation is infection.

Speeds up the catalog indexing of address book contacts, which is known to be a problem.

For me and my small list of contacts (61) I got the index time down from 599ms to 216ms:  about a ~66% improvement