Update to latest set of m4 macros.