Fix for assertion error when expanding macro.