Fix size estimator in the face of cycles.

@bug W-2257240@

@rev fabbott@
Merging origin/goliver/master-pending-size-est into master