Patch from Emmanuel Raguet <raguet@…> to correct macro expansion. These macros were modified to correct warnings and obviously needed more parentheses to expand correctly.