Fix clang-tidy dependencies and bad file comment.

This addresses comments in post-commit review of r187345.