api: further linting improvements.