Serious fixups for hyphenation code.