Get rid of unnecessary macros as they are only ever set to a single thing
15 files changed