I put the alphabetization in a separate commit, to keep things clean.