Improvements suggested by reviewers in my previous PR

[frankrousseau]

See https://github.com/cozy/cozy-contacts/pull/231 and commit comments for details.