Tidy up while working on #27334
Tidy up while working on #27334