We now use the correct name for function macros...