Missed some style comments from code reviews earlier today, trying to clean up.

Missed some style comments from code reviews yesterday, trying to clean up.

Testing Done:
CI passed.

Bugs closed: 686

Reviewed at https://rbcommons.com/s/twitter/r/1174/
Sync of https://github.com/pantsbuild/pants/commit/03a178d0dc7aad32e4538fb220710f17ac70f3de