Lint improvements.