Cleaned up preprocessor macros for elwise