Modeline fixups (mainly).