Add missing 'do' to macros