Rearranged formation flight messages to ease a future merge.