Macros:  Don't call error if a macro definition doesn't resolve

to a fixed point in applying macros. Instead, just return the
original string.