Comment 25 for bug 1814286

It sounds like the pragmatic move is to replace the macros by what they mean. Search & replace should work, and I think there are very few pages where those macros are used (if not just one page).
Bruno