Rearranging so I can ditch self-types.