adapted some m4 changes