Re #8882. Put the whole generator string in one place.