Rearrange some variables.