Various cleanups.

From comments in https://codereview.chromium.org/2663003003/.

BUG=none
R=huangs@chromium.org

Review-Url: https://codereview.chromium.org/2670133002
Cr-Commit-Position: refs/heads/master@{#447964}
6 files changed