Changes to vCard handling.