CDI-334, clean up language around alternatives and priorities