Clean up defines for type_traits

Change-Id: I10f228211fe5346f81246c9bdc70f50a0f90675f
Merge pull request #133 from awong-dev/clean-typetrait-macros

Clean up defines for type_traits