THIS macros cleanup.

2 files changed