Fix up introduction of additional macros.