Added macro expansion.