Fix weird problem with an optional arg to a macro.