This collection of improvements was implemented when working on
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40088,
but can be cleanly extracted here.

It includes N+1 fixes.