experimental macro support

Fixed.