More work on the macros.