Address post-commit review comments from r190038.

Mostly additional comments :-).