chore: minor improvements suggested by google3 analyzers (#3661)

4 files changed