Alphabetize the sections to make diffs nicer