Minor PR-related changes.

[Finishes #78038926]