Address review feedback.

4 jobs for !1677 with 2294-contact-list-worker in 11 minutes and 58 seconds (queued for 2 seconds)
latest merge request