I got rid of all the macros from the source.  Another case of dead, but harmless code.