added parens around macro arguments