Purge add && sub constant expression handling in -flatten-globals.
Alphabetize headers. This is solely for upstreaming purposes.