More progress.

[#53230709]