Rearrange a few things.