Rearrange definitions.