Re #7548. Fix OS X builds.

I don't know if this can overflow a size_t anywhere, but the progress
reporting going awry isn't such a big deal anyway.
Merge branch 'bugfix/7548_quantification_fixes' into develop