Followup comments from https://codereview.chromium.org/298893007/