Codereview cleanups following https://codereview.appspot.com/7142046

BUG=None

Review URL: https://codereview.appspot.com/7179051