Transition to new common m4 macros.