Some more linting fixes.