more m4 macro editing