Add g3 back to the mix and reorder to irritate them anal folk. Actually, it's

to group appropriately and provide cues to maintainers that the lists don't
need to be ordered.

llvm-svn: 23880