More unsplicing of macro definitions