put braces around all macro parameters