Revert to updateSize/updateLayout.

Separate calcSize/calcLayout too much hassle.