Minor changes to elwise macros