Closes #35307.
These were forgotten during the initial conversion, probably because most of them consisted only of a single entry. Fix that.