Bring API layout up to speed.
[ci skip]