Revert infinite loops introduced by Paul Eggert's spellfixes two days ago.