Change ordering of some macros to match expected, remove some out of date options


Former-commit-id: b3b8cb190dd98b5603e32e91c3a1333cf3729407