Yet more linting