[Backport 8.3] Fix code-gen for single or many types.#7248