Fixes nits found in landed CL's
https://codereview.chromium.org/1456783003,
https://codereview.chromium.org/1452293003, and
https://codereview.chromium.org/1460523005

BUG=None
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/1484023002 .