Minor cleanup and removal of unused constant

R=ben@chromium.org
BUG=none
TEST=none

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