Lint fixes for #16495

Fixes #16495.