Rearrange variable declarations.