core: Cleanup macro expansion.