Add bracing for all AC macro args, fixes last build break.