Minor code clean-ups (GH-20838)

1 file changed