Some cleanup towards M4.