More reordering fixes.