... and reshuffle it a bit.

BUG=v8:5495

Review-Url: https://codereview.chromium.org/2619823005
Cr-Commit-Position: refs/heads/master@{#42185}