Resolve "Follow-up from "Refactor discussions/notes code""

Closes #44939

See merge request gitlab-org/gitlab-ce!18190