Rearrange method definitions.