Give the new macros better names.