Added variants. KANJIDIC2 parser rewrite should be essentially complete.