better handling of gen1/gen2 for hyphenated words. See also: GH-8