Linting fixes.

8 jobs for release in 24 minutes and 25 seconds (queued for 3 seconds)