Rearranging pionless effective field theory