Additional m4 updates.