More linter warnings down.