Clean up defines for type_traits

The type_traits header has gotten a little sloppy on previous renames. This normalizes the pattern for a number of macros. No functionality change. That comes in the next patchset. :)

Change-Id: I10f228211fe5346f81246c9bdc70f50a0f90675f