This improves maintainability. The Compile and Wasm benchmarks,
tracking compile time, show no regression.

BUG=

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