Changes to support macro expansion.