Remove more -M* stuff.