Reorder some of these things.