I also applied the attached followup patch to clean out macros no longer 
used.