Fix M4 macro expand function