Instead of measuring just part of this, and adding up some hardcoded constants to the measured part, we can simply measure the whole thing.
In combination with the parent diff, this allows us to remove the hardcoded constants entirely, and rely purely on the measurement.
Depends on D13867