Fix standard macros which should expand to a string