cosmetics: Reorder some tables/lines to make future diffs smaller.