Refactor the code to allow for a better output

Isn't that prevented by symfony/symfony#11610?