Rearrange some more stuff.