Rearrange stuff a bit.