Rearranged definitions.