base: Reorder a bit.