update m4 macros (mainly formatting)