Merge two use into one
fixup! Initial attempt at rerolling patch from PR-2610
Safer initialization of HAS_FLOATED_DESCENDANTS_BITMASK