More work on supporting macros.