Improve generation handling in Kanji. Update tests. Use newer enamdict.