[Backport 8.7] Fix code-gen for single or many types.#7252