Further work on macro support