Better lexemes for hyphenated words. Fix GH-19.