Suggested fixes: cleaner use of macros