Put some of the X86 formats in a more logical order.