Correct handling of Control-m, also handle Control-i specially.