Add upper and lower versions of many macros