Just some code cleanup. No functional changes. No QE needed.
This merged while the bz bot was broken, and it doesn't need QE because there's nothing _specific_ to test