Reduce number of data-ensure loops and variables
Merge pull request #44651 from petercollingridge/multi-fract

Reduce number of data-ensure loops and variables