The refactor preceded some code reuse in an earlier iteration of
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8433
but is now just a small standalone improvement.