Issue #20715: Lint cleanup