In the file I'm actually not relying on the "correct" behavior of the later macro, so I can simply replace it with the more portable (but technically incorrect) version.