Re-order a bit.