Better linter fixes.