Fix linting issues
We should try to fix linting issues (
./mach lint
) after the
#33533 (closed)
rebase.