added parens around defines with calculated values