Include the contact itself in the colleagues list.
Minor refactoring.