Merge pull request #8605 from ctiller/fieldsz

More data massaging