Rearrangement

No functional change.