Use DataLoader `:variant` everywhere

[johncowen]

Description

See #3233

This issue is rollout of a refactor/improvement detailed in the above PR.

[github-actions]

This issue was inactive for 90 days. It will be reviewed in the next triage meeting and might be closed.
If you think this issue is still relevant, please comment on it or attend the next triage meeting.