Replace non-functional macros