New Year ruff cleanup. (#11595) #487

Job	Run time
test-unix-nightly (linux, 3.11, 12.1, nightly)	1d 0h 0m 1s
test-stable (linux, 3.11, 12.1, stable)	1d 0h 0m 1s
test-stable (linux, 3.12, 12.1, stable)	1d 0h 0m 1s
test-stable (linux, 3.10, 12.1, stable)	1s
	3d 0h 0m 4s

Provide feedback