Followup comments from https://codereview.chromium.org/298893007/ R=thakis@chromium.org Review URL: https://codereview.chromium.org/302653009