Small improvement to macro. Maybe (?).