Merge lp:~cosmos-door/ubuntu/utopic/libkkc/fix-1374949 into lp:ubuntu/utopic/libkkc

[Mitsuya Shibata]

* New upsteam release
* Change Build-Depends from libgee-dev to libgee-0.8-dev

[Mitsuya Shibata (cosmos-door)]

Already archived new package in debian. Does not need to merge, just sync.

review: Abstain

[Mitsuya Shibata (cosmos-door)]

review: Disapprove

Unmerged revisions

5. By Mitsuya Shibata on 2014-10-01

Change Build-Depends from libgee-dev to libgee-0.8-dev (LP: #1374949)

4. By Mitsuya Shibata on 2014-10-01

Import upstream version 0.3.4

=== modified file 'ChangeLog'
--- ChangeLog	2014-06-15 23:27:57 +0000
+++ ChangeLog	2014-10-01 15:12:30 +0000
@@ -1,3 +1,223 @@
+commit 4ffd6c8331d4575678aca7cad7c5e839d7dbd736
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jul 7 13:09:45 2014 +0900
+
+    Revert "build: Switch from intltool to gettext"
+
+    This reverts commit 25e166bda1f6308a9b4f26268791d55781112620.
+    The required gettext version 0.19.1 is not yet available on many
+    systems.
+
+ configure.ac |  3 +--
+ po/Makevars  | 72
+ ------------------------------------------------------------
+ 2 files changed, 1 insertion(+), 74 deletions(-)
+
+commit 784377b6c2aa7e78e193b4c4a7ebde9e1a5aeba3
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jul 7 13:06:29 2014 +0900
+
+    Bump version to 0.3.4
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 3cff841d1fb430fcb30236e20e7ec84214f2d9c1
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jul 7 13:05:36 2014 +0900
+
+    Update copyright year
+
+ Makefile.am                                             | 4 ++--
+ README                                                  | 4 ++--
+ configure.ac                                            | 4 ++--
+ data/Makefile.am                                        | 4 ++--
+ data/rules/Makefile.am                                  | 4 ++--
+ data/rules/README.rules                                 | 4 ++--
+ data/templates/Makefile.am                              | 4 ++--
+ data/templates/libkkc-data/Makefile.am                  | 4 ++--
+ data/templates/libkkc-data/configure.ac.in              | 4 ++--
+ data/templates/libkkc-data/data/Makefile.am             | 4 ++--
+ data/templates/libkkc-data/data/models/Makefile.sorted2 | 4 ++--
+ data/templates/libkkc-data/data/models/Makefile.sorted3 | 4 ++--
+ data/templates/libkkc-data/tools/Makefile.am            | 4 ++--
+ data/templates/libkkc-data/tools/genfilter.py           | 4 ++--
+ data/templates/libkkc-data/tools/sortlm.py              | 4 ++--
+ libkkc/Makefile.am                                      | 4 ++--
+ libkkc/bigram-decoder.vala                              | 4 ++--
+ libkkc/bloom-filter.vala                                | 4 ++--
+ libkkc/candidate-list.vala                              | 4 ++--
+ libkkc/candidate.vala                                   | 4 ++--
+ libkkc/context.vala                                     | 4 ++--
+ libkkc/convert-segment-state-handler.vala               | 4 ++--
+ libkkc/convert-sentence-state-handler.vala              | 4 ++--
+ libkkc/decoder.vala                                     | 4 ++--
+ libkkc/dictionary-list.vala                             | 4 ++--
+ libkkc/dictionary.vala                                  | 4 ++--
+ libkkc/encoding.vala                                    | 4 ++--
+ libkkc/expression.vala                                  | 4 ++--
+ libkkc/initial-state-handler.vala                       | 4 ++--
+ libkkc/key-event-filter.vala                            | 4 ++--
+ libkkc/key-event.vala                                   | 4 ++--
+ libkkc/keymap.vala                                      | 4 ++--
+ libkkc/keysyms.vala                                     | 4 ++--
+ libkkc/kkc-1.0.pc.in                                    | 4 ++--
+ libkkc/kkc.vala                                         | 4 ++--
+ libkkc/language-model-utils.vala                        | 4 ++--
+ libkkc/language-model.vala                              | 4 ++--
+ libkkc/map-file.vala                                    | 4 ++--
+ libkkc/metadata-file.vala                               | 4 ++--
+ libkkc/nicola.vala                                      | 4 ++--
+ libkkc/numeric-template.vala                            | 4 ++--
+ libkkc/rom-kana-utils.vala                              | 4 ++--
+ libkkc/rom-kana.vala                                    | 4 ++--
+ libkkc/rule.vala                                        | 4 ++--
+ libkkc/segment-dictionary.vala                          | 4 ++--
+ libkkc/segment-list.vala                                | 4 ++--
+ libkkc/segment.vala                                     | 4 ++--
+ libkkc/sentence-dictionary.vala                         | 4 ++--
+ libkkc/sorted-bigram-language-model.vala                | 4 ++--
+ libkkc/sorted-trigram-language-model.vala               | 4 ++--
+ libkkc/state.vala                                       | 4 ++--
+ libkkc/system-segment-dictionary.vala                   | 4 ++--
+ libkkc/template.vala                                    | 4 ++--
+ libkkc/text-bigram-language-model.vala                  | 4 ++--
+ libkkc/text-trigram-language-model.vala                 | 4 ++--
+ libkkc/trellis-node.vala                                | 4 ++--
+ libkkc/trigram-decoder.vala                             | 4 ++--
+ libkkc/user-dictionary.vala                             | 4 ++--
+ libkkc/user-segment-dictionary.vala                     | 4 ++--
+ libkkc/user-sentence-dictionary.vala                    | 4 ++--
+ libkkc/utils.vala                                       | 4 ++--
+ marisa-glib/Makefile.am                                 | 4 ++--
+ tests/Makefile.am                                       | 4 ++--
+ tools/Makefile.am                                       | 4 ++--
+ tools/kkc-package-data.in                               | 4 ++--
+ tools/kkc.vala                                          | 4 ++--
+ 66 files changed, 132 insertions(+), 132 deletions(-)
+
+commit 025d2fb3bf7e05bd7367d459bbf0557d5e929eab
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jun 16 12:18:40 2014 +0900
+
+    Update translations
+
+ po/ja.po | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+commit 95ecc6d8a21814a093e013c60e370ac49407013a
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jun 16 12:13:19 2014 +0900
+
+    Update translations
+
+ po/ja.po | 148
+ ++++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 81 insertions(+), 67 deletions(-)
+
+commit 25e166bda1f6308a9b4f26268791d55781112620
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jun 16 12:10:51 2014 +0900
+
+    build: Switch from intltool to gettext
+
+ configure.ac |  3 ++-
+ po/Makevars  | 72
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 74 insertions(+), 1 deletion(-)
+
+commit e5a21c69386a1c6681d63f5201fde2230a51f27a
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jun 16 12:00:41 2014 +0900
+
+    Fix dependencies
+
+    Can't make json-glib-1.0 and gee-0.8 optional, since some classes
+    provide
+    API using it for performance reason.
+
+ libkkc/kkc-1.0.deps  | 1 +
+ libkkc/kkc-1.0.pc.in | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 82ab9a22f97852fcc096347a663b3ea3b95626a8
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jun 16 11:27:23 2014 +0900
+
+    Fix package dependencies
+
+ libkkc/kkc-1.0.deps  | 2 --
+ libkkc/kkc-1.0.pc.in | 4 ++--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+commit baf68310e26cd090b6b5d7b4604cb4fcd5e5ca4f
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jun 16 11:17:36 2014 +0900
+
+    Fix HashSet name clash between Vala 0.26 glib-2.0.vapi and
+    gee-0.8.vapi
+
+ libkkc/bigram-decoder.vala  | 2 +-
+ libkkc/candidate-list.vala  | 2 +-
+ libkkc/map-file.vala        | 2 +-
+ libkkc/rule.vala            | 2 +-
+ libkkc/trigram-decoder.vala | 4 ++--
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+commit ebc714b954a7798646371eb3fd6fe4e51638f329
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jun 16 11:12:50 2014 +0900
+
+    Port to libgee 0.8 API
+
+ configure.ac                         |  4 ++--
+ libkkc/Makefile.am                   |  2 +-
+ libkkc/bigram-decoder.vala           | 12 ++++-------
+ libkkc/expression.vala               |  2 +-
+ libkkc/keymap.vala                   | 32 ++++++++++++-----------------
+ libkkc/kkc-1.0.pc.in                 |  2 +-
+ libkkc/nicola.vala                   |  4 ++--
+ libkkc/rule.vala                     | 40
+ ++++++++++++++++--------------------
+ libkkc/state.vala                    |  2 +-
+ libkkc/trigram-decoder.vala          |  3 +--
+ libkkc/user-segment-dictionary.vala  |  4 ++--
+ libkkc/user-sentence-dictionary.vala |  4 ++--
+ 12 files changed, 48 insertions(+), 63 deletions(-)
+
+commit 8a5366c976b0399a69e6b9f622ad29f987c8a52e
+Author: Daiki Ueno <[e-mail]>
+Date:   Mon Jun 16 10:50:34 2014 +0900
+
+    kkc-1.0.pc: Mark libgee and json-glib as private dependency
+
+ libkkc/kkc-1.0.pc.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 72a596d438f5ede05c59d733a05ba566a1259bcd
+Author: Daiki Ueno <[e-mail]>
+Date:   Tue May 13 16:30:46 2014 +0900
+
+    rom-kana: Retain partial input when "convert-*" commands are called
+
+    Suggested by Masafumi Miura.
+
+ libkkc/rom-kana.vala           | 14 +++++++++++---
+ tests/conversions-initial.json |  4 +++-
+ tests/lib/test-utils.vala      |  3 +++
+ 3 files changed, 17 insertions(+), 4 deletions(-)
+
+commit 5f38726532b8790e1320e1b35bc326439ef9cdb0
+Author: Daiki Ueno <[e-mail]>
+Date:   Tue May 13 12:04:27 2014 +0900
+
+    rom-kana: Assign "ly<X>" to HIRAGANA SMALL LETTER <X>
+
+    Suggested by Masafumi Miura.
+
+ data/rules/default/rom-kana/default.json | 5 +++++
+ 1 file changed, 5 insertions(+)
+
 commit 4859e8ab00b215d1cf6830a31cbb1abe8c0f06b1
 Author: Daiki Ueno <[e-mail]>
 Date:   Tue Apr 1 18:17:33 2014 +0900
 
=== modified file 'Makefile.am'
--- Makefile.am	2014-02-26 22:51:39 +0000
+++ Makefile.am	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Makefile.in'
--- Makefile.in	2014-02-26 22:51:39 +0000
+++ Makefile.in	2014-10-01 15:12:30 +0000
@@ -14,8 +14,8 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'README'
--- README	2014-02-26 22:51:39 +0000
+++ README	2014-10-01 15:12:30 +0000
@@ -46,8 +46,8 @@
 
 GPLv3+
 
-Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-Copyright (C) 2011-2013 Red Hat, Inc.
+Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+Copyright (C) 2011-2014 Red Hat, Inc.
 
 This file is free software; as a special exception the author gives
 unlimited permission to copy and/or distribute it, with or without
 
=== modified file 'aclocal.m4'
--- aclocal.m4	2014-06-15 23:27:57 +0000
+++ aclocal.m4	2014-10-01 15:12:30 +0000
@@ -20,105 +20,8 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=auto])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-	dnl Canonicalize enable_introspection
-	enable_introspection=$found_introspection
-    ],dnl
-    [dnl	
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER)
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])
-
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -365,6 +268,103 @@
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])# PKG_CHECK_VAR
 
+dnl -*- mode: autoconf -*-
+dnl Copyright 2009 Johan Dahlin
+dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+
+# serial 1
+
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+[
+    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
+
+    dnl enable/disable introspection
+    m4_if([$2], [require],
+    [dnl
+        enable_introspection=yes
+    ],[dnl
+        AC_ARG_ENABLE(introspection,
+                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+                                 [Enable introspection for this build]),, 
+                                 [enable_introspection=auto])
+    ])dnl
+
+    AC_MSG_CHECKING([for gobject-introspection])
+
+    dnl presence/version checking
+    AS_CASE([$enable_introspection],
+    [no], [dnl
+        found_introspection="no (disabled, use --enable-introspection to enable)"
+    ],dnl
+    [yes],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
+                         found_introspection=yes,
+                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
+    ],dnl
+    [auto],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
+	dnl Canonicalize enable_introspection
+	enable_introspection=$found_introspection
+    ],dnl
+    [dnl	
+        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
+    ])dnl
+
+    AC_MSG_RESULT([$found_introspection])
+
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
+    if test "x$found_introspection" = "xyes"; then
+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+    fi
+    AC_SUBST(INTROSPECTION_SCANNER)
+    AC_SUBST(INTROSPECTION_COMPILER)
+    AC_SUBST(INTROSPECTION_GENERATE)
+    AC_SUBST(INTROSPECTION_GIRDIR)
+    AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
+
+    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+])
+
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
+
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
+])
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
+
+
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
+])
+
 dnl vapigen.m4
 dnl
 dnl Copyright 2012 Evan Nemerson
 
=== modified file 'configure'
--- configure	2014-06-15 23:27:57 +0000
+++ configure	2014-10-01 15:12:30 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libkkc 0.3.3.
+# Generated by GNU Autoconf 2.69 for libkkc 0.3.4.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -649,8 +649,8 @@
 # Identity of this package.
 PACKAGE_NAME='libkkc'
 PACKAGE_TARNAME='libkkc'
-PACKAGE_VERSION='0.3.3'
-PACKAGE_STRING='libkkc 0.3.3'
+PACKAGE_VERSION='0.3.4'
+PACKAGE_STRING='libkkc 0.3.4'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1501,7 +1501,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libkkc 0.3.3 to adapt to many kinds of systems.
+\`configure' configures libkkc 0.3.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1571,7 +1571,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libkkc 0.3.3:";;
+     short | recursive ) echo "Configuration of libkkc 0.3.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1712,7 +1712,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libkkc configure 0.3.3
+libkkc configure 0.3.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2202,7 +2202,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libkkc $as_me 0.3.3, which was
+It was created by libkkc $as_me 0.3.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3080,7 +3080,7 @@
 
 # Define the identity of the package.
  PACKAGE='libkkc'
- VERSION='0.3.3'
+ VERSION='0.3.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9390,10 +9390,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  powerpcle-*linux*)
+	  powerpc64le-*linux*)
 	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
-	  powerpc-*linux*)
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -17679,12 +17679,12 @@
     pkg_cv_GEE_CFLAGS="$GEE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gee-1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gee-0.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GEE_CFLAGS=`$PKG_CONFIG --cflags "gee-1.0" 2>/dev/null`
+  pkg_cv_GEE_CFLAGS=`$PKG_CONFIG --cflags "gee-0.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -17696,12 +17696,12 @@
     pkg_cv_GEE_LIBS="$GEE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gee-1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gee-0.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GEE_LIBS=`$PKG_CONFIG --libs "gee-1.0" 2>/dev/null`
+  pkg_cv_GEE_LIBS=`$PKG_CONFIG --libs "gee-0.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -17722,18 +17722,18 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GEE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gee-1.0" 2>&1`
+	        GEE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gee-0.8" 2>&1`
         else
-	        GEE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gee-1.0" 2>&1`
+	        GEE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gee-0.8" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GEE_PKG_ERRORS" >&5
 
-	as_fn_error $? "can't find gee-1.0" "$LINENO" 5
+	as_fn_error $? "can't find gee-0.8" "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	as_fn_error $? "can't find gee-1.0" "$LINENO" 5
+	as_fn_error $? "can't find gee-0.8" "$LINENO" 5
 else
 	GEE_CFLAGS=$pkg_cv_GEE_CFLAGS
 	GEE_LIBS=$pkg_cv_GEE_LIBS
@@ -19222,7 +19222,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libkkc $as_me 0.3.3, which was
+This file was extended by libkkc $as_me 0.3.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19288,7 +19288,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libkkc config.status 0.3.3
+libkkc config.status 0.3.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2014-06-15 23:27:57 +0000
+++ configure.ac	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2012-2013 Red Hat, Inc.
+# Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2012-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 AC_PREREQ(2.63)
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_INIT([libkkc], [0.3.3], [[e-mail]])
+AC_INIT([libkkc], [0.3.4], [[e-mail]])
 
 KKC_API_VERSION=1.0
 KKC_API_MAJOR_VERSION=1
@@ -75,8 +75,8 @@
   [AC_MSG_ERROR([can't find gio-2.0])])
 
 # check gee
-PKG_CHECK_MODULES([GEE], [gee-1.0], ,
-  [AC_MSG_ERROR([can't find gee-1.0])])
+PKG_CHECK_MODULES([GEE], [gee-0.8], ,
+  [AC_MSG_ERROR([can't find gee-0.8])])
 
 # check json-glib
 PKG_CHECK_MODULES([JSON_GLIB], [json-glib-1.0], ,
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2014-02-26 22:51:39 +0000
+++ data/Makefile.am	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/Makefile.in'
--- data/Makefile.in	2014-02-26 22:51:39 +0000
+++ data/Makefile.in	2014-10-01 15:12:30 +0000
@@ -14,8 +14,8 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/rules/Makefile.am'
--- data/rules/Makefile.am	2014-02-26 22:51:39 +0000
+++ data/rules/Makefile.am	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/rules/Makefile.in'
--- data/rules/Makefile.in	2014-02-26 22:51:39 +0000
+++ data/rules/Makefile.in	2014-10-01 15:12:30 +0000
@@ -14,8 +14,8 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/rules/README.rules'
--- data/rules/README.rules	2014-02-26 22:51:39 +0000
+++ data/rules/README.rules	2014-10-01 15:12:30 +0000
@@ -161,8 +161,8 @@
 for "xka" and "b.", and removes a mapping "dha" from the current map
 file.
 
-Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-Copyright (C) 2011-2013 Red Hat, Inc.
+Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+Copyright (C) 2011-2014 Red Hat, Inc.
 
 This file is free software; as a special exception the author gives
 unlimited permission to copy and/or distribute it, with or without
 
=== modified file 'data/rules/default/rom-kana/default.json'
--- data/rules/default/rom-kana/default.json	2014-02-26 22:51:39 +0000
+++ data/rules/default/rom-kana/default.json	2014-10-01 15:12:30 +0000
@@ -97,6 +97,11 @@
             "lu": ["", "ぅ"],
             "le": ["", "ぇ"],
             "lo": ["", "ぉ"],
+            "lya": ["", "ゃ"],
+            "lyi": ["", "ぃ"],
+            "lyu": ["", "ゅ"],
+            "lye": ["", "ぇ"],
+            "lyo": ["", "ょ"],
             "kya": ["", "きゃ" ],
             "kye": ["", "きぇ" ],
             "kyi": ["", "きぃ" ],
 
=== modified file 'data/templates/Makefile.am'
--- data/templates/Makefile.am	2014-02-26 22:51:39 +0000
+++ data/templates/Makefile.am	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/templates/Makefile.in'
--- data/templates/Makefile.in	2014-02-26 22:51:39 +0000
+++ data/templates/Makefile.in	2014-10-01 15:12:30 +0000
@@ -14,8 +14,8 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/templates/libkkc-data/Makefile.am'
--- data/templates/libkkc-data/Makefile.am	2014-02-26 22:51:39 +0000
+++ data/templates/libkkc-data/Makefile.am	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/templates/libkkc-data/configure.ac.in'
--- data/templates/libkkc-data/configure.ac.in	2014-02-26 22:51:39 +0000
+++ data/templates/libkkc-data/configure.ac.in	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2012-2013 Red Hat, Inc.
+# Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2012-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/templates/libkkc-data/data/Makefile.am'
--- data/templates/libkkc-data/data/Makefile.am	2014-02-26 22:51:39 +0000
+++ data/templates/libkkc-data/data/Makefile.am	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2012-2013 Red Hat, Inc.
+# Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2012-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/templates/libkkc-data/data/models/Makefile.sorted2'
--- data/templates/libkkc-data/data/models/Makefile.sorted2	2014-02-26 22:51:39 +0000
+++ data/templates/libkkc-data/data/models/Makefile.sorted2	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2012-2013 Red Hat, Inc.
+# Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2012-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/templates/libkkc-data/data/models/Makefile.sorted3'
--- data/templates/libkkc-data/data/models/Makefile.sorted3	2014-02-26 22:51:39 +0000
+++ data/templates/libkkc-data/data/models/Makefile.sorted3	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2012-2013 Red Hat, Inc.
+# Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2012-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/templates/libkkc-data/tools/Makefile.am'
--- data/templates/libkkc-data/tools/Makefile.am	2014-02-26 22:51:39 +0000
+++ data/templates/libkkc-data/tools/Makefile.am	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/templates/libkkc-data/tools/genfilter.py'
--- data/templates/libkkc-data/tools/genfilter.py	2014-02-26 22:51:39 +0000
+++ data/templates/libkkc-data/tools/genfilter.py	2014-10-01 15:12:30 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'data/templates/libkkc-data/tools/sortlm.py'
--- data/templates/libkkc-data/tools/sortlm.py	2014-02-26 22:51:39 +0000
+++ data/templates/libkkc-data/tools/sortlm.py	2014-10-01 15:12:30 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
-# Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2011-2013 Red Hat, Inc.
+# Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2011-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-06-15 23:27:57 +0000
+++ debian/changelog	2014-10-01 15:12:30 +0000
@@ -1,3 +1,10 @@
+libkkc (0.3.4-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release.
+  * Change Build-Depends from libgee-dev to libgee-0.8-dev (LP: #1374949)
+
+ -- Mitsuya Shibata <[e-mail]>  Wed, 01 Oct 2014 23:33:01 +0900
+
 libkkc (0.3.3-1) unstable; urgency=medium
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2014-06-15 23:27:57 +0000
+++ debian/control	2014-10-01 15:12:30 +0000
@@ -1,13 +1,14 @@
 Source: libkkc
 Priority: extra
-Maintainer: IME Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: IME Packaging Team <[e-mail]>
 Uploaders: Mitsuya Shibata <[e-mail]>,
            Osamu Aoki <[e-mail]>
 Build-Depends: dh-autoreconf,
                debhelper (>= 9),
                gobject-introspection,
                intltool,
-               libgee-dev,
+               libgee-0.8-dev,
                libgirepository1.0-dev,
                libglib2.0-dev,
                libjson-glib-dev,
 
=== modified file 'docs/Makefile.am'
--- docs/Makefile.am	2014-06-15 23:27:57 +0000
+++ docs/Makefile.am	2014-10-01 15:12:30 +0000
@@ -53,7 +53,7 @@
 	config \
 	glib-2.0 \
 	gio-2.0 \
-	gee-1.0 \
+	gee-0.8 \
 	posix \
 	json-glib-1.0 \
 	marisa-glib \
 
=== modified file 'docs/Makefile.in'
--- docs/Makefile.in	2014-06-15 23:27:57 +0000
+++ docs/Makefile.in	2014-10-01 15:12:30 +0000
@@ -385,7 +385,7 @@
 	config \
 	glib-2.0 \
 	gio-2.0 \
-	gee-1.0 \
+	gee-0.8 \
 	posix \
 	json-glib-1.0 \
 	marisa-glib \
 
=== modified file 'libkkc/Kkc-1.0.gir'
--- libkkc/Kkc-1.0.gir	2014-06-15 23:27:57 +0000
+++ libkkc/Kkc-1.0.gir	2014-10-01 15:12:30 +0000
@@ -3,7 +3,7 @@
 <include name="GObject" version="2.0"/>
 <include name="Gio" version="2.0"/>
 <include name="Json" version="1.0"/>
-<include name="Gee" version="1.0"/>
+<include name="Gee" version="0.8"/>
 <package name="kkc-1.0"/>
 <c:include name="libkkc/libkkc.h"/>
 <namespace name="Kkc" version="1.0" c:prefix="Kkc">
@@ -8592,7 +8592,7 @@
 				<parameter name="type" transfer-ownership="none" allow-none="1">
 					<type name="GObject.Type" c:type="GType*"/>
 				</parameter>
-				<parameter name="callback" transfer-ownership="none" closure="2">
+				<parameter name="callback" transfer-ownership="none" closure="2" scope="call">
 					<type name="Kkc.DictionaryListDictionaryCallback" c:type="KkcDictionaryListDictionaryCallback"/>
 				</parameter>
 				<parameter name="callback_target" transfer-ownership="none" allow-none="1">
 
=== modified file 'libkkc/Makefile.am'
--- libkkc/Makefile.am	2014-06-15 23:27:57 +0000
+++ libkkc/Makefile.am	2014-10-01 15:12:30 +0000
@@ -1,5 +1,5 @@
-# Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2012-2013 Red Hat, Inc.
+# Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2012-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 	--pkg keysyms						\
 	--pkg glib-2.0						\
 	--pkg gio-2.0						\
-	--pkg gee-1.0						\
+	--pkg gee-0.8						\
 	--pkg json-glib-1.0					\
 	--pkg marisa-glib					\
 	--internal-vapi kkc-internals-@KKC_API_VERSION@.vapi	\
 
=== modified file 'libkkc/Makefile.in'
--- libkkc/Makefile.in	2014-06-15 23:27:57 +0000
+++ libkkc/Makefile.in	2014-10-01 15:12:30 +0000
@@ -14,8 +14,8 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
-# Copyright (C) 2012-2013 Red Hat, Inc.
+# Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+# Copyright (C) 2012-2014 Red Hat, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -485,7 +485,7 @@
 	--pkg keysyms						\
 	--pkg glib-2.0						\
 	--pkg gio-2.0						\
-	--pkg gee-1.0						\
+	--pkg gee-0.8						\
 	--pkg json-glib-1.0					\
 	--pkg marisa-glib					\
 	--internal-vapi kkc-internals-@KKC_API_VERSION@.vapi	\
 
=== modified file 'libkkc/bigram-decoder.c'
--- libkkc/bigram-decoder.c	2014-06-15 23:27:57 +0000
+++ libkkc/bigram-decoder.c	2014-10-01 15:12:30 +0000
@@ -1,9 +1,9 @@
-/* bigram-decoder.c generated by valac 0.22.1, the Vala compiler
+/* bigram-decoder.c generated by valac 0.24.0.131-42e78, the Vala compiler
  * generated from bigram-decoder.vala, do not modify */
 
 /*
- * Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2012-2013 Red Hat, Inc.
+ * Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2012-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -290,6 +290,7 @@
 KkcSegment* kkc_segment_construct (GType object_type, const gchar* input, const gchar* output);
 static gboolean _kkc_language_model_entry_equal (const KkcLanguageModelEntry* s1, const KkcLanguageModelEntry* s2);
 static gint kkc_bigram_decoder_compare_nbest_node (KkcNbestNode* a, KkcNbestNode* b);
+static gint _kkc_bigram_decoder_compare_nbest_node_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
 static gchar* kkc_bigram_decoder_concat_nbest_node_outputs (KkcBigramDecoder* self, KkcNbestNode* nbest_node);
 guint kkc_trellis_node_get_endpos (KkcTrellisNode* self);
 const gchar* kkc_trellis_node_get_output (KkcTrellisNode* self);
@@ -438,15 +439,13 @@
 
 static void kkc_nbest_node_class_init (KkcNbestNodeClass * klass) {
 	kkc_nbest_node_parent_class = g_type_class_peek_parent (klass);
-	KKC_NBEST_NODE_CLASS (klass)->finalize = kkc_nbest_node_finalize;
+	((KkcNbestNodeClass *) klass)->finalize = kkc_nbest_node_finalize;
 }
 
 
 static void kkc_nbest_node_instance_init (KkcNbestNode * self) {
-	gdouble _tmp0_ = 0.0;
 	self->gn = 0.0;
-	_tmp0_ = DBL_MAX;
-	self->fn = _tmp0_;
+	self->fn = DBL_MAX;
 	self->ref_count = 1;
 }
 
@@ -454,6 +453,7 @@
 static void kkc_nbest_node_finalize (KkcNbestNode* obj) {
 	KkcNbestNode * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, KKC_TYPE_NBEST_NODE, KkcNbestNode);
+	g_signal_handlers_destroy (self);
 	_kkc_trellis_node_unref0 (self->node);
 	_kkc_nbest_node_unref0 (self->next);
 }
@@ -498,27 +498,23 @@
 	gint _tmp1_ = 0;
 	gint* _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-	gdouble _tmp3_ = 0.0;
-	gdouble _tmp4_ = 0.0;
-	gint _tmp5_ = 0;
-	KkcSegment** _tmp6_ = NULL;
-	KkcSegment** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	gint _tmp3_ = 0;
+	KkcSegment** _tmp4_ = NULL;
+	KkcSegment** _tmp5_ = NULL;
+	gint _tmp5__length1 = 0;
 	self = (KkcBigramDecoder*) base;
 	g_return_val_if_fail (input != NULL, NULL);
 	_tmp0_ = input;
 	_tmp1_ = nbest;
 	_tmp2_ = constraint;
 	_tmp2__length1 = constraint_length1;
-	_tmp3_ = DBL_MAX;
-	_tmp4_ = DBL_MAX;
-	_tmp6_ = kkc_decoder_decode_with_costs ((KkcDecoder*) self, _tmp0_, _tmp1_, _tmp2_, _tmp2__length1, _tmp3_, -_tmp4_, &_tmp5_);
-	_tmp7_ = _tmp6_;
-	_tmp7__length1 = _tmp5_;
+	_tmp4_ = kkc_decoder_decode_with_costs ((KkcDecoder*) self, _tmp0_, _tmp1_, _tmp2_, _tmp2__length1, DBL_MAX, -DBL_MAX, &_tmp3_);
+	_tmp5_ = _tmp4_;
+	_tmp5__length1 = _tmp3_;
 	if (result_length1) {
-		*result_length1 = _tmp7__length1;
+		*result_length1 = _tmp5__length1;
 	}
-	result = _tmp7_;
+	result = _tmp5_;
 	return result;
 }
 
@@ -552,8 +548,8 @@
 	KkcSegment** _tmp14_ = NULL;
 	gint segments_length1 = 0;
 	gint _segments_size_ = 0;
-	KkcSegment** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
+	KkcSegment** _tmp22_ = NULL;
+	gint _tmp22__length1 = 0;
 	self = (KkcBigramDecoder*) base;
 	g_return_val_if_fail (input != NULL, NULL);
 	_tmp0_ = input;
@@ -589,41 +585,39 @@
 			gboolean _tmp15_ = FALSE;
 			_tmp15_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp16_ = FALSE;
-				gint _tmp18_ = 0;
+				gint _tmp17_ = 0;
+				GeeArrayList** _tmp18_ = NULL;
+				gint _tmp18__length1 = 0;
 				GeeArrayList** _tmp19_ = NULL;
 				gint _tmp19__length1 = 0;
-				GeeArrayList** _tmp20_ = NULL;
-				gint _tmp20__length1 = 0;
-				gint _tmp21_ = 0;
-				GeeArrayList* _tmp22_ = NULL;
-				_tmp16_ = _tmp15_;
-				if (!_tmp16_) {
-					gint _tmp17_ = 0;
-					_tmp17_ = i;
-					i = _tmp17_ + 1;
+				gint _tmp20_ = 0;
+				GeeArrayList* _tmp21_ = NULL;
+				if (!_tmp15_) {
+					gint _tmp16_ = 0;
+					_tmp16_ = i;
+					i = _tmp16_ + 1;
 				}
 				_tmp15_ = FALSE;
-				_tmp18_ = i;
+				_tmp17_ = i;
+				_tmp18_ = trellis;
+				_tmp18__length1 = trellis_length1;
+				if (!(_tmp17_ < _tmp18__length1)) {
+					break;
+				}
 				_tmp19_ = trellis;
 				_tmp19__length1 = trellis_length1;
-				if (!(_tmp18_ < _tmp19__length1)) {
-					break;
-				}
-				_tmp20_ = trellis;
-				_tmp20__length1 = trellis_length1;
-				_tmp21_ = i;
-				_tmp22_ = _tmp20_[_tmp21_];
-				gee_abstract_collection_clear ((GeeAbstractCollection*) _tmp22_);
+				_tmp20_ = i;
+				_tmp21_ = _tmp19_[_tmp20_];
+				gee_abstract_collection_clear ((GeeAbstractCollection*) _tmp21_);
 			}
 		}
 	}
-	_tmp23_ = segments;
-	_tmp23__length1 = segments_length1;
+	_tmp22_ = segments;
+	_tmp22__length1 = segments_length1;
 	if (result_length1) {
-		*result_length1 = _tmp23__length1;
+		*result_length1 = _tmp22__length1;
 	}
-	result = _tmp23_;
+	result = _tmp22_;
 	trellis = (_vala_array_free (trellis, trellis_length1, (GDestroyNotify) g_object_unref), NULL);
 	return result;
 }
@@ -674,15 +668,14 @@
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
 	glong _tmp1_ = 0L;
-	gboolean _tmp3_ = FALSE;
-	glong _tmp9_ = 0L;
-	glong _tmp15_ = 0L;
+	glong _tmp8_ = 0L;
+	glong _tmp14_ = 0L;
+	glong _tmp17_ = 0L;
 	glong _tmp18_ = 0L;
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
-	glong _tmp22_ = 0L;
-	gchar* _tmp23_ = NULL;
+	gchar* _tmp22_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp1_ = offset;
 	if (_tmp1_ >= ((glong) 0)) {
@@ -692,55 +685,54 @@
 	} else {
 		_tmp0_ = FALSE;
 	}
-	_tmp3_ = _tmp0_;
-	if (_tmp3_) {
+	if (_tmp0_) {
+		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-		glong _tmp6_ = 0L;
-		_tmp4_ = offset;
-		_tmp5_ = len;
-		_tmp6_ = string_strnlen ((gchar*) self, _tmp4_ + _tmp5_);
-		string_length = _tmp6_;
+		_tmp3_ = offset;
+		_tmp4_ = len;
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+		string_length = _tmp5_;
 	} else {
+		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		_tmp7_ = strlen (self);
-		_tmp8_ = _tmp7_;
-		string_length = (glong) _tmp8_;
+		_tmp6_ = strlen (self);
+		_tmp7_ = _tmp6_;
+		string_length = (glong) _tmp7_;
 	}
-	_tmp9_ = offset;
-	if (_tmp9_ < ((glong) 0)) {
+	_tmp8_ = offset;
+	if (_tmp8_ < ((glong) 0)) {
+		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
+		_tmp9_ = string_length;
+		_tmp10_ = offset;
+		offset = _tmp9_ + _tmp10_;
+		_tmp11_ = offset;
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+	} else {
 		glong _tmp12_ = 0L;
-		_tmp10_ = string_length;
-		_tmp11_ = offset;
-		offset = _tmp10_ + _tmp11_;
+		glong _tmp13_ = 0L;
 		_tmp12_ = offset;
-		g_return_val_if_fail (_tmp12_ >= ((glong) 0), NULL);
-	} else {
-		glong _tmp13_ = 0L;
-		glong _tmp14_ = 0L;
-		_tmp13_ = offset;
-		_tmp14_ = string_length;
-		g_return_val_if_fail (_tmp13_ <= _tmp14_, NULL);
+		_tmp13_ = string_length;
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
 	}
-	_tmp15_ = len;
-	if (_tmp15_ < ((glong) 0)) {
+	_tmp14_ = len;
+	if (_tmp14_ < ((glong) 0)) {
+		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-		glong _tmp17_ = 0L;
-		_tmp16_ = string_length;
-		_tmp17_ = offset;
-		len = _tmp16_ - _tmp17_;
+		_tmp15_ = string_length;
+		_tmp16_ = offset;
+		len = _tmp15_ - _tmp16_;
 	}
-	_tmp18_ = offset;
-	_tmp19_ = len;
-	_tmp20_ = string_length;
-	g_return_val_if_fail ((_tmp18_ + _tmp19_) <= _tmp20_, NULL);
-	_tmp21_ = offset;
-	_tmp22_ = len;
-	_tmp23_ = g_strndup (((gchar*) self) + _tmp21_, (gsize) _tmp22_);
-	result = _tmp23_;
+	_tmp17_ = offset;
+	_tmp18_ = len;
+	_tmp19_ = string_length;
+	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+	_tmp20_ = offset;
+	_tmp21_ = len;
+	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+	result = _tmp22_;
 	return result;
 }
 
@@ -755,145 +747,139 @@
 			gboolean _tmp0_ = FALSE;
 			_tmp0_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp1_ = FALSE;
-				gint _tmp3_ = 0;
-				GeeArrayList** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				_tmp1_ = _tmp0_;
-				if (!_tmp1_) {
-					gint _tmp2_ = 0;
-					_tmp2_ = i;
-					i = _tmp2_ + 1;
+				gint _tmp2_ = 0;
+				GeeArrayList** _tmp3_ = NULL;
+				gint _tmp3__length1 = 0;
+				if (!_tmp0_) {
+					gint _tmp1_ = 0;
+					_tmp1_ = i;
+					i = _tmp1_ + 1;
 				}
 				_tmp0_ = FALSE;
-				_tmp3_ = i;
-				_tmp4_ = trellis;
-				_tmp4__length1 = trellis_length1;
-				if (!(_tmp3_ < _tmp4__length1)) {
+				_tmp2_ = i;
+				_tmp3_ = trellis;
+				_tmp3__length1 = trellis_length1;
+				if (!(_tmp2_ < _tmp3__length1)) {
 					break;
 				}
 				{
 					gint j = 0;
-					gint _tmp5_ = 0;
-					_tmp5_ = i;
-					j = _tmp5_;
+					gint _tmp4_ = 0;
+					_tmp4_ = i;
+					j = _tmp4_;
 					{
-						gboolean _tmp6_ = FALSE;
-						_tmp6_ = TRUE;
+						gboolean _tmp5_ = FALSE;
+						_tmp5_ = TRUE;
 						while (TRUE) {
 							gboolean _tmp7_ = FALSE;
-							gboolean _tmp9_ = FALSE;
-							gint _tmp10_ = 0;
-							GeeArrayList** _tmp11_ = NULL;
-							gint _tmp11__length1 = 0;
-							gboolean _tmp17_ = FALSE;
-							gint* _tmp18_ = NULL;
-							gint _tmp18__length1 = 0;
-							gint _tmp19_ = 0;
+							gint _tmp8_ = 0;
+							GeeArrayList** _tmp9_ = NULL;
+							gint _tmp9__length1 = 0;
+							gint* _tmp15_ = NULL;
+							gint _tmp15__length1 = 0;
+							gint _tmp16_ = 0;
+							gint _tmp17_ = 0;
+							gboolean _tmp18_ = FALSE;
+							glong offset = 0L;
+							const gchar* _tmp19_ = NULL;
 							gint _tmp20_ = 0;
-							gboolean _tmp21_ = FALSE;
-							glong offset = 0L;
+							gint _tmp21_ = 0;
+							glong length = 0L;
 							const gchar* _tmp22_ = NULL;
 							gint _tmp23_ = 0;
 							gint _tmp24_ = 0;
-							glong length = 0L;
-							const gchar* _tmp25_ = NULL;
-							gint _tmp26_ = 0;
-							gint _tmp27_ = 0;
+							glong _tmp25_ = 0L;
+							gchar* _input = NULL;
+							const gchar* _tmp26_ = NULL;
+							glong _tmp27_ = 0L;
 							glong _tmp28_ = 0L;
-							gchar* _input = NULL;
-							const gchar* _tmp29_ = NULL;
-							glong _tmp30_ = 0L;
-							glong _tmp31_ = 0L;
-							gchar* _tmp32_ = NULL;
+							gchar* _tmp29_ = NULL;
 							KkcLanguageModelEntry entry = {0};
-							const gchar* _tmp33_ = NULL;
-							gchar* _tmp34_ = NULL;
-							const gchar* _tmp35_ = NULL;
-							gchar* _tmp36_ = NULL;
-							KkcLanguageModelEntry _tmp37_ = {0};
+							const gchar* _tmp30_ = NULL;
+							gchar* _tmp31_ = NULL;
+							const gchar* _tmp32_ = NULL;
+							gchar* _tmp33_ = NULL;
+							KkcLanguageModelEntry _tmp34_ = {0};
 							KkcUnigramTrellisNode* node = NULL;
-							KkcLanguageModelEntry _tmp38_ = {0};
+							KkcLanguageModelEntry _tmp35_ = {0};
+							gint _tmp36_ = 0;
+							KkcUnigramTrellisNode* _tmp37_ = NULL;
+							GeeArrayList** _tmp38_ = NULL;
+							gint _tmp38__length1 = 0;
 							gint _tmp39_ = 0;
-							KkcUnigramTrellisNode* _tmp40_ = NULL;
-							GeeArrayList** _tmp41_ = NULL;
-							gint _tmp41__length1 = 0;
-							gint _tmp42_ = 0;
-							GeeArrayList* _tmp43_ = NULL;
-							KkcUnigramTrellisNode* _tmp44_ = NULL;
-							_tmp7_ = _tmp6_;
+							GeeArrayList* _tmp40_ = NULL;
+							KkcUnigramTrellisNode* _tmp41_ = NULL;
+							if (!_tmp5_) {
+								gint _tmp6_ = 0;
+								_tmp6_ = j;
+								j = _tmp6_ + 1;
+							}
+							_tmp5_ = FALSE;
+							_tmp8_ = j;
+							_tmp9_ = trellis;
+							_tmp9__length1 = trellis_length1;
+							if (_tmp8_ < _tmp9__length1) {
+								GeeArrayList** _tmp10_ = NULL;
+								gint _tmp10__length1 = 0;
+								gint _tmp11_ = 0;
+								GeeArrayList* _tmp12_ = NULL;
+								gboolean _tmp13_ = FALSE;
+								gboolean _tmp14_ = FALSE;
+								_tmp10_ = trellis;
+								_tmp10__length1 = trellis_length1;
+								_tmp11_ = j;
+								_tmp12_ = _tmp10_[_tmp11_];
+								_tmp13_ = gee_collection_get_is_empty ((GeeCollection*) _tmp12_);
+								_tmp14_ = _tmp13_;
+								_tmp7_ = _tmp14_;
+							} else {
+								_tmp7_ = FALSE;
+							}
 							if (!_tmp7_) {
-								gint _tmp8_ = 0;
-								_tmp8_ = j;
-								j = _tmp8_ + 1;
-							}
-							_tmp6_ = FALSE;
-							_tmp10_ = j;
-							_tmp11_ = trellis;
-							_tmp11__length1 = trellis_length1;
-							if (_tmp10_ < _tmp11__length1) {
-								GeeArrayList** _tmp12_ = NULL;
-								gint _tmp12__length1 = 0;
-								gint _tmp13_ = 0;
-								GeeArrayList* _tmp14_ = NULL;
-								gboolean _tmp15_ = FALSE;
-								gboolean _tmp16_ = FALSE;
-								_tmp12_ = trellis;
-								_tmp12__length1 = trellis_length1;
-								_tmp13_ = j;
-								_tmp14_ = _tmp12_[_tmp13_];
-								_tmp15_ = gee_abstract_collection_get_is_empty ((GeeAbstractCollection*) _tmp14_);
-								_tmp16_ = _tmp15_;
-								_tmp9_ = _tmp16_;
-							} else {
-								_tmp9_ = FALSE;
-							}
-							_tmp17_ = _tmp9_;
-							if (!_tmp17_) {
 								break;
 							}
-							_tmp18_ = constraint;
-							_tmp18__length1 = constraint_length1;
-							_tmp19_ = i;
-							_tmp20_ = j;
-							_tmp21_ = kkc_bigram_decoder_check_overlaps (self, _tmp18_, _tmp18__length1, _tmp19_, _tmp20_);
-							if (!_tmp21_) {
+							_tmp15_ = constraint;
+							_tmp15__length1 = constraint_length1;
+							_tmp16_ = i;
+							_tmp17_ = j;
+							_tmp18_ = kkc_bigram_decoder_check_overlaps (self, _tmp15_, _tmp15__length1, _tmp16_, _tmp17_);
+							if (!_tmp18_) {
 								continue;
 							}
+							_tmp19_ = input;
+							_tmp20_ = i;
+							_tmp21_ = string_index_of_nth_char (_tmp19_, (glong) (_tmp20_ - 1));
+							offset = (glong) _tmp21_;
 							_tmp22_ = input;
-							_tmp23_ = i;
-							_tmp24_ = string_index_of_nth_char (_tmp22_, (glong) (_tmp23_ - 1));
-							offset = (glong) _tmp24_;
-							_tmp25_ = input;
-							_tmp26_ = j;
-							_tmp27_ = string_index_of_nth_char (_tmp25_, (glong) _tmp26_);
-							_tmp28_ = offset;
-							length = _tmp27_ - _tmp28_;
-							_tmp29_ = input;
-							_tmp30_ = offset;
-							_tmp31_ = length;
-							_tmp32_ = string_substring (_tmp29_, _tmp30_, _tmp31_);
-							_input = _tmp32_;
-							_tmp33_ = _input;
-							_tmp34_ = g_strdup (_tmp33_);
-							_tmp35_ = _input;
-							_tmp36_ = g_strdup (_tmp35_);
-							_g_free0 (_tmp37_.input);
-							_tmp37_.input = _tmp34_;
-							_g_free0 (_tmp37_.output);
-							_tmp37_.output = _tmp36_;
-							_tmp37_.id = (guint) 2;
-							entry = _tmp37_;
-							_tmp38_ = entry;
+							_tmp23_ = j;
+							_tmp24_ = string_index_of_nth_char (_tmp22_, (glong) _tmp23_);
+							_tmp25_ = offset;
+							length = _tmp24_ - _tmp25_;
+							_tmp26_ = input;
+							_tmp27_ = offset;
+							_tmp28_ = length;
+							_tmp29_ = string_substring (_tmp26_, _tmp27_, _tmp28_);
+							_input = _tmp29_;
+							_tmp30_ = _input;
+							_tmp31_ = g_strdup (_tmp30_);
+							_tmp32_ = _input;
+							_tmp33_ = g_strdup (_tmp32_);
+							_g_free0 (_tmp34_.input);
+							_tmp34_.input = _tmp31_;
+							_g_free0 (_tmp34_.output);
+							_tmp34_.output = _tmp33_;
+							_tmp34_.id = (guint) 2;
+							entry = _tmp34_;
+							_tmp35_ = entry;
+							_tmp36_ = j;
+							_tmp37_ = kkc_unigram_trellis_node_new (&_tmp35_, (guint) _tmp36_);
+							node = _tmp37_;
+							_tmp38_ = trellis;
+							_tmp38__length1 = trellis_length1;
 							_tmp39_ = j;
-							_tmp40_ = kkc_unigram_trellis_node_new (&_tmp38_, (guint) _tmp39_);
-							node = _tmp40_;
-							_tmp41_ = trellis;
-							_tmp41__length1 = trellis_length1;
-							_tmp42_ = j;
-							_tmp43_ = _tmp41_[_tmp42_];
-							_tmp44_ = node;
-							gee_abstract_collection_add ((GeeAbstractCollection*) _tmp43_, (KkcTrellisNode*) _tmp44_);
+							_tmp40_ = _tmp38_[_tmp39_];
+							_tmp41_ = node;
+							gee_abstract_collection_add ((GeeAbstractCollection*) _tmp40_, (KkcTrellisNode*) _tmp41_);
 							_kkc_trellis_node_unref0 (node);
 							kkc_language_model_entry_destroy (&entry);
 							_g_free0 (_input);
@@ -917,29 +903,29 @@
 	gint trellis_length1 = 0;
 	gint _trellis_size_ = 0;
 	KkcUnigramTrellisNode* bos_node = NULL;
+	KkcBigramLanguageModel* _tmp12_ = NULL;
 	KkcBigramLanguageModel* _tmp13_ = NULL;
-	KkcBigramLanguageModel* _tmp14_ = NULL;
+	KkcLanguageModelEntry _tmp14_ = {0};
 	KkcLanguageModelEntry _tmp15_ = {0};
-	KkcLanguageModelEntry _tmp16_ = {0};
-	KkcUnigramTrellisNode* _tmp17_ = NULL;
-	GeeArrayList** _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
-	GeeArrayList* _tmp19_ = NULL;
-	KkcUnigramTrellisNode* _tmp20_ = NULL;
+	KkcUnigramTrellisNode* _tmp16_ = NULL;
+	GeeArrayList** _tmp17_ = NULL;
+	gint _tmp17__length1 = 0;
+	GeeArrayList* _tmp18_ = NULL;
+	KkcUnigramTrellisNode* _tmp19_ = NULL;
 	KkcUnigramTrellisNode* eos_node = NULL;
+	KkcBigramLanguageModel* _tmp20_ = NULL;
 	KkcBigramLanguageModel* _tmp21_ = NULL;
-	KkcBigramLanguageModel* _tmp22_ = NULL;
+	KkcLanguageModelEntry _tmp22_ = {0};
 	KkcLanguageModelEntry _tmp23_ = {0};
-	KkcLanguageModelEntry _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	KkcUnigramTrellisNode* _tmp26_ = NULL;
-	GeeArrayList** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	gint _tmp28_ = 0;
-	GeeArrayList* _tmp29_ = NULL;
-	KkcUnigramTrellisNode* _tmp30_ = NULL;
-	GeeArrayList** _tmp68_ = NULL;
-	gint _tmp68__length1 = 0;
+	gint _tmp24_ = 0;
+	KkcUnigramTrellisNode* _tmp25_ = NULL;
+	GeeArrayList** _tmp26_ = NULL;
+	gint _tmp26__length1 = 0;
+	gint _tmp27_ = 0;
+	GeeArrayList* _tmp28_ = NULL;
+	KkcUnigramTrellisNode* _tmp29_ = NULL;
+	GeeArrayList** _tmp66_ = NULL;
+	gint _tmp66__length1 = 0;
 	g_return_val_if_fail (self != NULL, NULL);
 	g_return_val_if_fail (input != NULL, NULL);
 	_tmp0_ = input;
@@ -957,176 +943,172 @@
 			gboolean _tmp4_ = FALSE;
 			_tmp4_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp5_ = FALSE;
-				gint _tmp7_ = 0;
+				gint _tmp6_ = 0;
+				GeeArrayList** _tmp7_ = NULL;
+				gint _tmp7__length1 = 0;
 				GeeArrayList** _tmp8_ = NULL;
 				gint _tmp8__length1 = 0;
-				GeeArrayList** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gint _tmp10_ = 0;
+				gint _tmp9_ = 0;
+				GeeArrayList* _tmp10_ = NULL;
 				GeeArrayList* _tmp11_ = NULL;
-				GeeArrayList* _tmp12_ = NULL;
-				_tmp5_ = _tmp4_;
-				if (!_tmp5_) {
-					gint _tmp6_ = 0;
-					_tmp6_ = i;
-					i = _tmp6_ + 1;
+				if (!_tmp4_) {
+					gint _tmp5_ = 0;
+					_tmp5_ = i;
+					i = _tmp5_ + 1;
 				}
 				_tmp4_ = FALSE;
-				_tmp7_ = i;
+				_tmp6_ = i;
+				_tmp7_ = trellis;
+				_tmp7__length1 = trellis_length1;
+				if (!(_tmp6_ < _tmp7__length1)) {
+					break;
+				}
 				_tmp8_ = trellis;
 				_tmp8__length1 = trellis_length1;
-				if (!(_tmp7_ < _tmp8__length1)) {
-					break;
-				}
-				_tmp9_ = trellis;
-				_tmp9__length1 = trellis_length1;
-				_tmp10_ = i;
-				_tmp11_ = gee_array_list_new (KKC_TYPE_TRELLIS_NODE, (GBoxedCopyFunc) kkc_trellis_node_ref, kkc_trellis_node_unref, NULL);
-				_g_object_unref0 (_tmp9_[_tmp10_]);
-				_tmp9_[_tmp10_] = _tmp11_;
-				_tmp12_ = _tmp9_[_tmp10_];
+				_tmp9_ = i;
+				_tmp10_ = gee_array_list_new (KKC_TYPE_TRELLIS_NODE, (GBoxedCopyFunc) kkc_trellis_node_ref, kkc_trellis_node_unref, NULL, NULL, NULL);
+				_g_object_unref0 (_tmp8_[_tmp9_]);
+				_tmp8_[_tmp9_] = _tmp10_;
+				_tmp11_ = _tmp8_[_tmp9_];
 			}
 		}
 	}
-	_tmp13_ = kkc_bigram_decoder_get_model (self);
-	_tmp14_ = _tmp13_;
-	kkc_language_model_get_bos ((KkcLanguageModel*) _tmp14_, &_tmp15_);
-	_tmp16_ = _tmp15_;
-	_tmp17_ = kkc_unigram_trellis_node_new (&_tmp16_, (guint) 1);
-	bos_node = _tmp17_;
-	_tmp18_ = trellis;
-	_tmp18__length1 = trellis_length1;
-	_tmp19_ = _tmp18_[0];
-	_tmp20_ = bos_node;
-	gee_abstract_collection_add ((GeeAbstractCollection*) _tmp19_, (KkcTrellisNode*) _tmp20_);
-	_tmp21_ = kkc_bigram_decoder_get_model (self);
-	_tmp22_ = _tmp21_;
-	kkc_language_model_get_eos ((KkcLanguageModel*) _tmp22_, &_tmp23_);
-	_tmp24_ = _tmp23_;
-	_tmp25_ = length;
-	_tmp26_ = kkc_unigram_trellis_node_new (&_tmp24_, (guint) (_tmp25_ + 1));
-	eos_node = _tmp26_;
-	_tmp27_ = trellis;
-	_tmp27__length1 = trellis_length1;
-	_tmp28_ = length;
-	_tmp29_ = _tmp27_[_tmp28_ + 1];
-	_tmp30_ = eos_node;
-	gee_abstract_collection_add ((GeeAbstractCollection*) _tmp29_, (KkcTrellisNode*) _tmp30_);
+	_tmp12_ = kkc_bigram_decoder_get_model (self);
+	_tmp13_ = _tmp12_;
+	kkc_language_model_get_bos ((KkcLanguageModel*) _tmp13_, &_tmp14_);
+	_tmp15_ = _tmp14_;
+	_tmp16_ = kkc_unigram_trellis_node_new (&_tmp15_, (guint) 1);
+	bos_node = _tmp16_;
+	_tmp17_ = trellis;
+	_tmp17__length1 = trellis_length1;
+	_tmp18_ = _tmp17_[0];
+	_tmp19_ = bos_node;
+	gee_abstract_collection_add ((GeeAbstractCollection*) _tmp18_, (KkcTrellisNode*) _tmp19_);
+	_tmp20_ = kkc_bigram_decoder_get_model (self);
+	_tmp21_ = _tmp20_;
+	kkc_language_model_get_eos ((KkcLanguageModel*) _tmp21_, &_tmp22_);
+	_tmp23_ = _tmp22_;
+	_tmp24_ = length;
+	_tmp25_ = kkc_unigram_trellis_node_new (&_tmp23_, (guint) (_tmp24_ + 1));
+	eos_node = _tmp25_;
+	_tmp26_ = trellis;
+	_tmp26__length1 = trellis_length1;
+	_tmp27_ = length;
+	_tmp28_ = _tmp26_[_tmp27_ + 1];
+	_tmp29_ = eos_node;
+	gee_abstract_collection_add ((GeeAbstractCollection*) _tmp28_, (KkcTrellisNode*) _tmp29_);
 	{
 		gint i = 0;
 		i = 0;
 		{
-			gboolean _tmp31_ = FALSE;
-			_tmp31_ = TRUE;
+			gboolean _tmp30_ = FALSE;
+			_tmp30_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp32_ = FALSE;
-				gint _tmp34_ = 0;
+				gint _tmp32_ = 0;
+				gint _tmp33_ = 0;
+				glong byte_offset = 0L;
+				const gchar* _tmp34_ = NULL;
 				gint _tmp35_ = 0;
-				glong byte_offset = 0L;
-				const gchar* _tmp36_ = NULL;
-				gint _tmp37_ = 0;
-				gint _tmp38_ = 0;
+				gint _tmp36_ = 0;
 				gchar* _input = NULL;
-				const gchar* _tmp39_ = NULL;
-				glong _tmp40_ = 0L;
-				gchar* _tmp41_ = NULL;
+				const gchar* _tmp37_ = NULL;
+				glong _tmp38_ = 0L;
+				gchar* _tmp39_ = NULL;
 				GeeCollection* entries = NULL;
-				KkcBigramLanguageModel* _tmp42_ = NULL;
-				KkcBigramLanguageModel* _tmp43_ = NULL;
-				const gchar* _tmp44_ = NULL;
-				GeeCollection* _tmp45_ = NULL;
-				_tmp32_ = _tmp31_;
-				if (!_tmp32_) {
-					gint _tmp33_ = 0;
-					_tmp33_ = i;
-					i = _tmp33_ + 1;
+				KkcBigramLanguageModel* _tmp40_ = NULL;
+				KkcBigramLanguageModel* _tmp41_ = NULL;
+				const gchar* _tmp42_ = NULL;
+				GeeCollection* _tmp43_ = NULL;
+				if (!_tmp30_) {
+					gint _tmp31_ = 0;
+					_tmp31_ = i;
+					i = _tmp31_ + 1;
 				}
-				_tmp31_ = FALSE;
-				_tmp34_ = i;
-				_tmp35_ = length;
-				if (!(_tmp34_ < _tmp35_)) {
+				_tmp30_ = FALSE;
+				_tmp32_ = i;
+				_tmp33_ = length;
+				if (!(_tmp32_ < _tmp33_)) {
 					break;
 				}
-				_tmp36_ = input;
-				_tmp37_ = i;
-				_tmp38_ = string_index_of_nth_char (_tmp36_, (glong) _tmp37_);
-				byte_offset = (glong) _tmp38_;
-				_tmp39_ = input;
-				_tmp40_ = byte_offset;
-				_tmp41_ = string_substring (_tmp39_, _tmp40_, (glong) (-1));
-				_input = _tmp41_;
-				_tmp42_ = kkc_bigram_decoder_get_model (self);
-				_tmp43_ = _tmp42_;
-				_tmp44_ = _input;
-				_tmp45_ = kkc_language_model_entries ((KkcLanguageModel*) _tmp43_, _tmp44_);
-				entries = _tmp45_;
+				_tmp34_ = input;
+				_tmp35_ = i;
+				_tmp36_ = string_index_of_nth_char (_tmp34_, (glong) _tmp35_);
+				byte_offset = (glong) _tmp36_;
+				_tmp37_ = input;
+				_tmp38_ = byte_offset;
+				_tmp39_ = string_substring (_tmp37_, _tmp38_, (glong) (-1));
+				_input = _tmp39_;
+				_tmp40_ = kkc_bigram_decoder_get_model (self);
+				_tmp41_ = _tmp40_;
+				_tmp42_ = _input;
+				_tmp43_ = kkc_language_model_entries ((KkcLanguageModel*) _tmp41_, _tmp42_);
+				entries = _tmp43_;
 				{
 					GeeIterator* _entry_it = NULL;
-					GeeCollection* _tmp46_ = NULL;
-					GeeIterator* _tmp47_ = NULL;
-					_tmp46_ = entries;
-					_tmp47_ = gee_iterable_iterator ((GeeIterable*) _tmp46_);
-					_entry_it = _tmp47_;
+					GeeCollection* _tmp44_ = NULL;
+					GeeIterator* _tmp45_ = NULL;
+					_tmp44_ = entries;
+					_tmp45_ = gee_iterable_iterator ((GeeIterable*) _tmp44_);
+					_entry_it = _tmp45_;
 					while (TRUE) {
+						GeeIterator* _tmp46_ = NULL;
+						gboolean _tmp47_ = FALSE;
+						KkcLanguageModelEntry* entry = NULL;
 						GeeIterator* _tmp48_ = NULL;
-						gboolean _tmp49_ = FALSE;
-						KkcLanguageModelEntry* entry = NULL;
-						GeeIterator* _tmp50_ = NULL;
-						gpointer _tmp51_ = NULL;
+						gpointer _tmp49_ = NULL;
 						gint j = 0;
-						gint _tmp52_ = 0;
-						KkcLanguageModelEntry* _tmp53_ = NULL;
-						const gchar* _tmp54_ = NULL;
+						gint _tmp50_ = 0;
+						KkcLanguageModelEntry* _tmp51_ = NULL;
+						const gchar* _tmp52_ = NULL;
+						gint _tmp53_ = 0;
+						gint* _tmp54_ = NULL;
+						gint _tmp54__length1 = 0;
 						gint _tmp55_ = 0;
-						gint* _tmp56_ = NULL;
-						gint _tmp56__length1 = 0;
-						gint _tmp57_ = 0;
-						gint _tmp58_ = 0;
-						gboolean _tmp59_ = FALSE;
+						gint _tmp56_ = 0;
+						gboolean _tmp57_ = FALSE;
 						KkcUnigramTrellisNode* node = NULL;
-						KkcLanguageModelEntry* _tmp60_ = NULL;
-						gint _tmp61_ = 0;
-						KkcLanguageModelEntry _tmp62_ = {0};
-						KkcUnigramTrellisNode* _tmp63_ = NULL;
-						GeeArrayList** _tmp64_ = NULL;
-						gint _tmp64__length1 = 0;
-						gint _tmp65_ = 0;
-						GeeArrayList* _tmp66_ = NULL;
-						KkcUnigramTrellisNode* _tmp67_ = NULL;
+						KkcLanguageModelEntry* _tmp58_ = NULL;
+						gint _tmp59_ = 0;
+						KkcLanguageModelEntry _tmp60_ = {0};
+						KkcUnigramTrellisNode* _tmp61_ = NULL;
+						GeeArrayList** _tmp62_ = NULL;
+						gint _tmp62__length1 = 0;
+						gint _tmp63_ = 0;
+						GeeArrayList* _tmp64_ = NULL;
+						KkcUnigramTrellisNode* _tmp65_ = NULL;
+						_tmp46_ = _entry_it;
+						_tmp47_ = gee_iterator_next (_tmp46_);
+						if (!_tmp47_) {
+							break;
+						}
 						_tmp48_ = _entry_it;
-						_tmp49_ = gee_iterator_next (_tmp48_);
-						if (!_tmp49_) {
-							break;
-						}
-						_tmp50_ = _entry_it;
-						_tmp51_ = gee_iterator_get (_tmp50_);
-						entry = (KkcLanguageModelEntry*) _tmp51_;
-						_tmp52_ = i;
-						_tmp53_ = entry;
-						_tmp54_ = (*_tmp53_).input;
-						_tmp55_ = g_utf8_strlen (_tmp54_, (gssize) (-1));
-						j = _tmp52_ + _tmp55_;
-						_tmp56_ = constraint;
-						_tmp56__length1 = constraint_length1;
-						_tmp57_ = i;
-						_tmp58_ = j;
-						_tmp59_ = kkc_bigram_decoder_check_constraint (self, _tmp56_, _tmp56__length1, _tmp57_, _tmp58_);
-						if (!_tmp59_) {
+						_tmp49_ = gee_iterator_get (_tmp48_);
+						entry = (KkcLanguageModelEntry*) _tmp49_;
+						_tmp50_ = i;
+						_tmp51_ = entry;
+						_tmp52_ = (*_tmp51_).input;
+						_tmp53_ = g_utf8_strlen (_tmp52_, (gssize) (-1));
+						j = _tmp50_ + _tmp53_;
+						_tmp54_ = constraint;
+						_tmp54__length1 = constraint_length1;
+						_tmp55_ = i;
+						_tmp56_ = j;
+						_tmp57_ = kkc_bigram_decoder_check_constraint (self, _tmp54_, _tmp54__length1, _tmp55_, _tmp56_);
+						if (!_tmp57_) {
 							_kkc_language_model_entry_free0 (entry);
 							continue;
 						}
-						_tmp60_ = entry;
-						_tmp61_ = j;
-						_tmp62_ = *_tmp60_;
-						_tmp63_ = kkc_unigram_trellis_node_new (&_tmp62_, (guint) _tmp61_);
-						node = _tmp63_;
-						_tmp64_ = trellis;
-						_tmp64__length1 = trellis_length1;
-						_tmp65_ = j;
-						_tmp66_ = _tmp64_[_tmp65_];
-						_tmp67_ = node;
-						gee_abstract_collection_add ((GeeAbstractCollection*) _tmp66_, (KkcTrellisNode*) _tmp67_);
+						_tmp58_ = entry;
+						_tmp59_ = j;
+						_tmp60_ = *_tmp58_;
+						_tmp61_ = kkc_unigram_trellis_node_new (&_tmp60_, (guint) _tmp59_);
+						node = _tmp61_;
+						_tmp62_ = trellis;
+						_tmp62__length1 = trellis_length1;
+						_tmp63_ = j;
+						_tmp64_ = _tmp62_[_tmp63_];
+						_tmp65_ = node;
+						gee_abstract_collection_add ((GeeAbstractCollection*) _tmp64_, (KkcTrellisNode*) _tmp65_);
 						_kkc_trellis_node_unref0 (node);
 						_kkc_language_model_entry_free0 (entry);
 					}
@@ -1137,12 +1119,12 @@
 			}
 		}
 	}
-	_tmp68_ = trellis;
-	_tmp68__length1 = trellis_length1;
+	_tmp66_ = trellis;
+	_tmp66__length1 = trellis_length1;
 	if (result_length1) {
-		*result_length1 = _tmp68__length1;
+		*result_length1 = _tmp66__length1;
 	}
-	result = _tmp68_;
+	result = _tmp66_;
 	_kkc_trellis_node_unref0 (eos_node);
 	_kkc_trellis_node_unref0 (bos_node);
 	return result;
@@ -1154,8 +1136,8 @@
 	gint last_c = 0;
 	gint* _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
+	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
 	g_return_val_if_fail (self != NULL, FALSE);
 	last_c = 0;
 	_tmp0_ = constraint;
@@ -1174,8 +1156,7 @@
 				gboolean _tmp1_ = FALSE;
 				gint _tmp2_ = 0;
 				gint _tmp3_ = 0;
-				gboolean _tmp6_ = FALSE;
-				gint _tmp7_ = 0;
+				gint _tmp6_ = 0;
 				_tmp2_ = i;
 				_tmp3_ = last_c;
 				if (_tmp2_ == _tmp3_) {
@@ -1187,19 +1168,18 @@
 				} else {
 					_tmp1_ = FALSE;
 				}
-				_tmp6_ = _tmp1_;
-				if (_tmp6_) {
+				if (_tmp1_) {
 					result = TRUE;
 					return result;
 				}
-				_tmp7_ = c;
-				last_c = _tmp7_;
+				_tmp6_ = c;
+				last_c = _tmp6_;
 			}
 		}
 	}
-	_tmp8_ = i;
-	_tmp9_ = last_c;
-	result = _tmp8_ >= _tmp9_;
+	_tmp7_ = i;
+	_tmp8_ = last_c;
+	result = _tmp7_ >= _tmp8_;
 	return result;
 }
 
@@ -1209,8 +1189,8 @@
 	gint last_c = 0;
 	gint* _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
+	gint _tmp13_ = 0;
+	gint _tmp14_ = 0;
 	g_return_val_if_fail (self != NULL, FALSE);
 	last_c = 0;
 	_tmp0_ = constraint;
@@ -1230,9 +1210,7 @@
 				gboolean _tmp2_ = FALSE;
 				gint _tmp3_ = 0;
 				gint _tmp4_ = 0;
-				gboolean _tmp7_ = FALSE;
-				gboolean _tmp14_ = FALSE;
-				gint _tmp15_ = 0;
+				gint _tmp12_ = 0;
 				_tmp3_ = last_c;
 				_tmp4_ = i;
 				if (_tmp3_ <= _tmp4_) {
@@ -1244,41 +1222,37 @@
 				} else {
 					_tmp2_ = FALSE;
 				}
-				_tmp7_ = _tmp2_;
-				if (_tmp7_) {
-					gboolean _tmp8_ = FALSE;
+				if (_tmp2_) {
+					gboolean _tmp7_ = FALSE;
+					gint _tmp8_ = 0;
 					gint _tmp9_ = 0;
-					gint _tmp10_ = 0;
-					gboolean _tmp13_ = FALSE;
-					_tmp9_ = last_c;
-					_tmp10_ = j;
-					if (_tmp9_ <= _tmp10_) {
+					_tmp8_ = last_c;
+					_tmp9_ = j;
+					if (_tmp8_ <= _tmp9_) {
+						gint _tmp10_ = 0;
 						gint _tmp11_ = 0;
-						gint _tmp12_ = 0;
-						_tmp11_ = j;
-						_tmp12_ = c;
-						_tmp8_ = _tmp11_ <= _tmp12_;
+						_tmp10_ = j;
+						_tmp11_ = c;
+						_tmp7_ = _tmp10_ <= _tmp11_;
 					} else {
-						_tmp8_ = FALSE;
+						_tmp7_ = FALSE;
 					}
-					_tmp13_ = _tmp8_;
-					_tmp1_ = _tmp13_;
+					_tmp1_ = _tmp7_;
 				} else {
 					_tmp1_ = FALSE;
 				}
-				_tmp14_ = _tmp1_;
-				if (_tmp14_) {
+				if (_tmp1_) {
 					result = TRUE;
 					return result;
 				}
-				_tmp15_ = c;
-				last_c = _tmp15_;
+				_tmp12_ = c;
+				last_c = _tmp12_;
 			}
 		}
 	}
-	_tmp16_ = i;
-	_tmp17_ = last_c;
-	result = _tmp16_ >= _tmp17_;
+	_tmp13_ = i;
+	_tmp14_ = last_c;
+	result = _tmp13_ >= _tmp14_;
 	return result;
 }
 
@@ -1298,191 +1272,187 @@
 			gboolean _tmp0_ = FALSE;
 			_tmp0_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp1_ = FALSE;
-				gint _tmp3_ = 0;
-				GeeArrayList** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
-				_tmp1_ = _tmp0_;
-				if (!_tmp1_) {
-					gint _tmp2_ = 0;
-					_tmp2_ = i;
-					i = _tmp2_ + 1;
+				gint _tmp2_ = 0;
+				GeeArrayList** _tmp3_ = NULL;
+				gint _tmp3__length1 = 0;
+				if (!_tmp0_) {
+					gint _tmp1_ = 0;
+					_tmp1_ = i;
+					i = _tmp1_ + 1;
 				}
 				_tmp0_ = FALSE;
-				_tmp3_ = i;
-				_tmp4_ = trellis;
-				_tmp4__length1 = trellis_length1;
-				if (!(_tmp3_ < _tmp4__length1)) {
+				_tmp2_ = i;
+				_tmp3_ = trellis;
+				_tmp3__length1 = trellis_length1;
+				if (!(_tmp2_ < _tmp3__length1)) {
 					break;
 				}
 				{
 					GeeArrayList* _node_list = NULL;
-					GeeArrayList** _tmp5_ = NULL;
-					gint _tmp5__length1 = 0;
-					gint _tmp6_ = 0;
+					GeeArrayList** _tmp4_ = NULL;
+					gint _tmp4__length1 = 0;
+					gint _tmp5_ = 0;
+					GeeArrayList* _tmp6_ = NULL;
 					GeeArrayList* _tmp7_ = NULL;
+					gint _node_size = 0;
 					GeeArrayList* _tmp8_ = NULL;
-					gint _node_size = 0;
-					GeeArrayList* _tmp9_ = NULL;
+					gint _tmp9_ = 0;
 					gint _tmp10_ = 0;
-					gint _tmp11_ = 0;
 					gint _node_index = 0;
-					_tmp5_ = trellis;
-					_tmp5__length1 = trellis_length1;
-					_tmp6_ = i;
-					_tmp7_ = _tmp5_[_tmp6_];
-					_tmp8_ = _g_object_ref0 (_tmp7_);
-					_node_list = _tmp8_;
-					_tmp9_ = _node_list;
-					_tmp10_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp9_);
-					_tmp11_ = _tmp10_;
-					_node_size = _tmp11_;
+					_tmp4_ = trellis;
+					_tmp4__length1 = trellis_length1;
+					_tmp5_ = i;
+					_tmp6_ = _tmp4_[_tmp5_];
+					_tmp7_ = _g_object_ref0 (_tmp6_);
+					_node_list = _tmp7_;
+					_tmp8_ = _node_list;
+					_tmp9_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp8_);
+					_tmp10_ = _tmp9_;
+					_node_size = _tmp10_;
 					_node_index = -1;
 					while (TRUE) {
+						gint _tmp11_ = 0;
 						gint _tmp12_ = 0;
 						gint _tmp13_ = 0;
-						gint _tmp14_ = 0;
 						KkcTrellisNode* node = NULL;
-						GeeArrayList* _tmp15_ = NULL;
-						gint _tmp16_ = 0;
-						gpointer _tmp17_ = NULL;
+						GeeArrayList* _tmp14_ = NULL;
+						gint _tmp15_ = 0;
+						gpointer _tmp16_ = NULL;
 						gint j = 0;
-						gint _tmp18_ = 0;
-						KkcTrellisNode* _tmp19_ = NULL;
+						gint _tmp17_ = 0;
+						KkcTrellisNode* _tmp18_ = NULL;
+						guint _tmp19_ = 0U;
 						guint _tmp20_ = 0U;
-						guint _tmp21_ = 0U;
-						gint _tmp22_ = 0;
+						gint _tmp21_ = 0;
 						gdouble max_cost = 0.0;
-						gdouble _tmp23_ = 0.0;
 						KkcTrellisNode* max_pnode = NULL;
-						KkcTrellisNode* _tmp48_ = NULL;
+						KkcTrellisNode* _tmp46_ = NULL;
+						KkcTrellisNode* _tmp51_ = NULL;
+						gdouble _tmp52_ = 0.0;
 						KkcTrellisNode* _tmp53_ = NULL;
-						gdouble _tmp54_ = 0.0;
+						KkcTrellisNode* _tmp54_ = NULL;
 						KkcTrellisNode* _tmp55_ = NULL;
-						KkcTrellisNode* _tmp56_ = NULL;
-						KkcTrellisNode* _tmp57_ = NULL;
+						_tmp11_ = _node_index;
+						_node_index = _tmp11_ + 1;
 						_tmp12_ = _node_index;
-						_node_index = _tmp12_ + 1;
-						_tmp13_ = _node_index;
-						_tmp14_ = _node_size;
-						if (!(_tmp13_ < _tmp14_)) {
+						_tmp13_ = _node_size;
+						if (!(_tmp12_ < _tmp13_)) {
 							break;
 						}
-						_tmp15_ = _node_list;
-						_tmp16_ = _node_index;
-						_tmp17_ = gee_abstract_list_get ((GeeAbstractList*) _tmp15_, _tmp16_);
-						node = (KkcTrellisNode*) _tmp17_;
-						_tmp18_ = i;
-						_tmp19_ = node;
-						_tmp20_ = kkc_trellis_node_get_length (_tmp19_);
-						_tmp21_ = _tmp20_;
-						j = _tmp18_ - ((gint) _tmp21_);
-						_tmp22_ = j;
-						if (_tmp22_ < 0) {
+						_tmp14_ = _node_list;
+						_tmp15_ = _node_index;
+						_tmp16_ = gee_abstract_list_get ((GeeAbstractList*) _tmp14_, _tmp15_);
+						node = (KkcTrellisNode*) _tmp16_;
+						_tmp17_ = i;
+						_tmp18_ = node;
+						_tmp19_ = kkc_trellis_node_get_length (_tmp18_);
+						_tmp20_ = _tmp19_;
+						j = _tmp17_ - ((gint) _tmp20_);
+						_tmp21_ = j;
+						if (_tmp21_ < 0) {
 							_kkc_trellis_node_unref0 (node);
 							continue;
 						}
-						_tmp23_ = DBL_MAX;
-						max_cost = -_tmp23_;
+						max_cost = -DBL_MAX;
 						max_pnode = NULL;
 						{
 							GeeArrayList* _pnode_list = NULL;
-							GeeArrayList** _tmp24_ = NULL;
-							gint _tmp24__length1 = 0;
-							gint _tmp25_ = 0;
+							GeeArrayList** _tmp22_ = NULL;
+							gint _tmp22__length1 = 0;
+							gint _tmp23_ = 0;
+							GeeArrayList* _tmp24_ = NULL;
+							GeeArrayList* _tmp25_ = NULL;
+							gint _pnode_size = 0;
 							GeeArrayList* _tmp26_ = NULL;
-							GeeArrayList* _tmp27_ = NULL;
-							gint _pnode_size = 0;
-							GeeArrayList* _tmp28_ = NULL;
-							gint _tmp29_ = 0;
-							gint _tmp30_ = 0;
+							gint _tmp27_ = 0;
+							gint _tmp28_ = 0;
 							gint _pnode_index = 0;
-							_tmp24_ = trellis;
-							_tmp24__length1 = trellis_length1;
-							_tmp25_ = j;
-							_tmp26_ = _tmp24_[_tmp25_];
-							_tmp27_ = _g_object_ref0 (_tmp26_);
-							_pnode_list = _tmp27_;
-							_tmp28_ = _pnode_list;
-							_tmp29_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp28_);
-							_tmp30_ = _tmp29_;
-							_pnode_size = _tmp30_;
+							_tmp22_ = trellis;
+							_tmp22__length1 = trellis_length1;
+							_tmp23_ = j;
+							_tmp24_ = _tmp22_[_tmp23_];
+							_tmp25_ = _g_object_ref0 (_tmp24_);
+							_pnode_list = _tmp25_;
+							_tmp26_ = _pnode_list;
+							_tmp27_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp26_);
+							_tmp28_ = _tmp27_;
+							_pnode_size = _tmp28_;
 							_pnode_index = -1;
 							while (TRUE) {
+								gint _tmp29_ = 0;
+								gint _tmp30_ = 0;
 								gint _tmp31_ = 0;
-								gint _tmp32_ = 0;
+								KkcTrellisNode* pnode = NULL;
+								GeeArrayList* _tmp32_ = NULL;
 								gint _tmp33_ = 0;
-								KkcTrellisNode* pnode = NULL;
-								GeeArrayList* _tmp34_ = NULL;
-								gint _tmp35_ = 0;
-								gpointer _tmp36_ = NULL;
+								gpointer _tmp34_ = NULL;
 								gdouble cost = 0.0;
+								KkcTrellisNode* _tmp35_ = NULL;
+								gdouble _tmp36_ = 0.0;
 								KkcTrellisNode* _tmp37_ = NULL;
-								gdouble _tmp38_ = 0.0;
-								KkcTrellisNode* _tmp39_ = NULL;
-								KkcTrellisNode* _tmp40_ = NULL;
-								gint _tmp41_ = 0;
+								KkcTrellisNode* _tmp38_ = NULL;
+								gint _tmp39_ = 0;
+								gdouble _tmp40_ = 0.0;
+								gdouble _tmp41_ = 0.0;
 								gdouble _tmp42_ = 0.0;
-								gdouble _tmp43_ = 0.0;
-								gdouble _tmp44_ = 0.0;
-								_tmp31_ = _pnode_index;
-								_pnode_index = _tmp31_ + 1;
-								_tmp32_ = _pnode_index;
-								_tmp33_ = _pnode_size;
-								if (!(_tmp32_ < _tmp33_)) {
+								_tmp29_ = _pnode_index;
+								_pnode_index = _tmp29_ + 1;
+								_tmp30_ = _pnode_index;
+								_tmp31_ = _pnode_size;
+								if (!(_tmp30_ < _tmp31_)) {
 									break;
 								}
-								_tmp34_ = _pnode_list;
-								_tmp35_ = _pnode_index;
-								_tmp36_ = gee_abstract_list_get ((GeeAbstractList*) _tmp34_, _tmp35_);
-								pnode = (KkcTrellisNode*) _tmp36_;
+								_tmp32_ = _pnode_list;
+								_tmp33_ = _pnode_index;
+								_tmp34_ = gee_abstract_list_get ((GeeAbstractList*) _tmp32_, _tmp33_);
+								pnode = (KkcTrellisNode*) _tmp34_;
+								_tmp35_ = pnode;
+								_tmp36_ = _tmp35_->cumulative_cost;
 								_tmp37_ = pnode;
-								_tmp38_ = _tmp37_->cumulative_cost;
-								_tmp39_ = pnode;
-								_tmp40_ = node;
-								_tmp41_ = j;
-								_tmp42_ = kkc_bigram_decoder_path_cost (self, _tmp39_, _tmp40_, _tmp41_);
-								cost = _tmp38_ + _tmp42_;
-								_tmp43_ = cost;
-								_tmp44_ = max_cost;
-								if (_tmp43_ > _tmp44_) {
-									KkcTrellisNode* _tmp45_ = NULL;
-									KkcTrellisNode* _tmp46_ = NULL;
-									gdouble _tmp47_ = 0.0;
-									_tmp45_ = pnode;
-									_tmp46_ = _kkc_trellis_node_ref0 (_tmp45_);
+								_tmp38_ = node;
+								_tmp39_ = j;
+								_tmp40_ = kkc_bigram_decoder_path_cost (self, _tmp37_, _tmp38_, _tmp39_);
+								cost = _tmp36_ + _tmp40_;
+								_tmp41_ = cost;
+								_tmp42_ = max_cost;
+								if (_tmp41_ > _tmp42_) {
+									KkcTrellisNode* _tmp43_ = NULL;
+									KkcTrellisNode* _tmp44_ = NULL;
+									gdouble _tmp45_ = 0.0;
+									_tmp43_ = pnode;
+									_tmp44_ = _kkc_trellis_node_ref0 (_tmp43_);
 									_kkc_trellis_node_unref0 (max_pnode);
-									max_pnode = _tmp46_;
-									_tmp47_ = cost;
-									max_cost = _tmp47_;
+									max_pnode = _tmp44_;
+									_tmp45_ = cost;
+									max_cost = _tmp45_;
 								}
 								_kkc_trellis_node_unref0 (pnode);
 							}
 							_g_object_unref0 (_pnode_list);
 						}
-						_tmp48_ = max_pnode;
-						if (_tmp48_ == NULL) {
-							GeeArrayList** _tmp49_ = NULL;
-							gint _tmp49__length1 = 0;
-							gint _tmp50_ = 0;
-							GeeArrayList* _tmp51_ = NULL;
-							gpointer _tmp52_ = NULL;
-							_tmp49_ = trellis;
-							_tmp49__length1 = trellis_length1;
-							_tmp50_ = i;
-							_tmp51_ = _tmp49_[_tmp50_];
-							_tmp52_ = gee_abstract_list_get ((GeeAbstractList*) _tmp51_, 0);
+						_tmp46_ = max_pnode;
+						if (_tmp46_ == NULL) {
+							GeeArrayList** _tmp47_ = NULL;
+							gint _tmp47__length1 = 0;
+							gint _tmp48_ = 0;
+							GeeArrayList* _tmp49_ = NULL;
+							gpointer _tmp50_ = NULL;
+							_tmp47_ = trellis;
+							_tmp47__length1 = trellis_length1;
+							_tmp48_ = i;
+							_tmp49_ = _tmp47_[_tmp48_];
+							_tmp50_ = gee_abstract_list_get ((GeeAbstractList*) _tmp49_, 0);
 							_kkc_trellis_node_unref0 (max_pnode);
-							max_pnode = (KkcTrellisNode*) _tmp52_;
+							max_pnode = (KkcTrellisNode*) _tmp50_;
 						}
+						_tmp51_ = node;
+						_tmp52_ = max_cost;
+						_tmp51_->cumulative_cost = _tmp52_;
 						_tmp53_ = node;
-						_tmp54_ = max_cost;
-						_tmp53_->cumulative_cost = _tmp54_;
-						_tmp55_ = node;
-						_tmp56_ = max_pnode;
-						_tmp57_ = _kkc_trellis_node_ref0 (_tmp56_);
-						_kkc_trellis_node_unref0 (_tmp55_->previous);
-						_tmp55_->previous = _tmp57_;
+						_tmp54_ = max_pnode;
+						_tmp55_ = _kkc_trellis_node_ref0 (_tmp54_);
+						_kkc_trellis_node_unref0 (_tmp53_->previous);
+						_tmp53_->previous = _tmp55_;
 						_kkc_trellis_node_unref0 (max_pnode);
 						_kkc_trellis_node_unref0 (node);
 					}
@@ -1504,16 +1474,15 @@
 	KkcUnigramTrellisNode* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	KkcUnigramTrellisNode* _tmp5_ = NULL;
-	gboolean _tmp7_ = FALSE;
+	KkcBigramLanguageModel* _tmp7_ = NULL;
 	KkcBigramLanguageModel* _tmp8_ = NULL;
-	KkcBigramLanguageModel* _tmp9_ = NULL;
-	KkcUnigramTrellisNode* _tmp10_ = NULL;
+	KkcUnigramTrellisNode* _tmp9_ = NULL;
+	KkcLanguageModelEntry _tmp10_ = {0};
 	KkcLanguageModelEntry _tmp11_ = {0};
-	KkcLanguageModelEntry _tmp12_ = {0};
-	KkcUnigramTrellisNode* _tmp13_ = NULL;
+	KkcUnigramTrellisNode* _tmp12_ = NULL;
+	KkcLanguageModelEntry _tmp13_ = {0};
 	KkcLanguageModelEntry _tmp14_ = {0};
-	KkcLanguageModelEntry _tmp15_ = {0};
-	gdouble _tmp16_ = 0.0;
+	gdouble _tmp15_ = 0.0;
 	g_return_val_if_fail (pnode != NULL, 0.0);
 	g_return_val_if_fail (node != NULL, 0.0);
 	_tmp0_ = pnode;
@@ -1530,18 +1499,17 @@
 	} else {
 		_tmp4_ = FALSE;
 	}
-	_tmp7_ = _tmp4_;
-	_vala_assert (_tmp7_, "upnode != null && unode != null");
-	_tmp8_ = kkc_bigram_decoder_get_model (self);
-	_tmp9_ = _tmp8_;
-	_tmp10_ = upnode;
-	kkc_unigram_trellis_node_get_entry (_tmp10_, &_tmp11_);
-	_tmp12_ = _tmp11_;
-	_tmp13_ = unode;
-	kkc_unigram_trellis_node_get_entry (_tmp13_, &_tmp14_);
-	_tmp15_ = _tmp14_;
-	_tmp16_ = kkc_bigram_language_model_bigram_backoff_cost (_tmp9_, &_tmp12_, &_tmp15_);
-	result = _tmp16_;
+	_vala_assert (_tmp4_, "upnode != null && unode != null");
+	_tmp7_ = kkc_bigram_decoder_get_model (self);
+	_tmp8_ = _tmp7_;
+	_tmp9_ = upnode;
+	kkc_unigram_trellis_node_get_entry (_tmp9_, &_tmp10_);
+	_tmp11_ = _tmp10_;
+	_tmp12_ = unode;
+	kkc_unigram_trellis_node_get_entry (_tmp12_, &_tmp13_);
+	_tmp14_ = _tmp13_;
+	_tmp15_ = kkc_bigram_language_model_bigram_backoff_cost (_tmp8_, &_tmp11_, &_tmp14_);
+	result = _tmp15_;
 	_kkc_trellis_node_unref0 (unode);
 	_kkc_trellis_node_unref0 (upnode);
 	return result;
@@ -1566,113 +1534,109 @@
 		gboolean _tmp0_ = FALSE;
 		_tmp0_ = TRUE;
 		while (TRUE) {
-			gboolean _tmp1_ = FALSE;
+			KkcNbestNode* _tmp3_ = NULL;
 			KkcNbestNode* _tmp4_ = NULL;
-			KkcNbestNode* _tmp5_ = NULL;
-			_tmp1_ = _tmp0_;
-			if (!_tmp1_) {
+			if (!_tmp0_) {
+				KkcNbestNode* _tmp1_ = NULL;
 				KkcNbestNode* _tmp2_ = NULL;
-				KkcNbestNode* _tmp3_ = NULL;
-				_tmp2_ = nbest_node;
-				_tmp3_ = _tmp2_->next;
-				nbest_node = _tmp3_;
+				_tmp1_ = nbest_node;
+				_tmp2_ = _tmp1_->next;
+				nbest_node = _tmp2_;
 			}
 			_tmp0_ = FALSE;
-			_tmp4_ = nbest_node;
-			_tmp5_ = _tmp4_->next;
-			if (!(_tmp5_ != NULL)) {
+			_tmp3_ = nbest_node;
+			_tmp4_ = _tmp3_->next;
+			if (!(_tmp4_ != NULL)) {
 				break;
 			}
 			{
 				gint i = 0;
 				i = 0;
 				{
-					gboolean _tmp6_ = FALSE;
-					_tmp6_ = TRUE;
+					gboolean _tmp5_ = FALSE;
+					_tmp5_ = TRUE;
 					while (TRUE) {
-						gboolean _tmp7_ = FALSE;
-						gint _tmp9_ = 0;
-						KkcNbestNode* _tmp10_ = NULL;
-						KkcTrellisNode* _tmp11_ = NULL;
-						KkcLanguageModelEntry* _tmp12_ = NULL;
-						gint _tmp12__length1 = 0;
-						KkcLanguageModelEntry* _tmp13_ = NULL;
-						gint _tmp13__length1 = 0;
+						gint _tmp7_ = 0;
+						KkcNbestNode* _tmp8_ = NULL;
+						KkcTrellisNode* _tmp9_ = NULL;
+						KkcLanguageModelEntry* _tmp10_ = NULL;
+						gint _tmp10__length1 = 0;
+						KkcLanguageModelEntry* _tmp11_ = NULL;
+						gint _tmp11__length1 = 0;
 						KkcLanguageModelEntry entry = {0};
-						KkcNbestNode* _tmp14_ = NULL;
-						KkcTrellisNode* _tmp15_ = NULL;
-						KkcLanguageModelEntry* _tmp16_ = NULL;
-						gint _tmp16__length1 = 0;
-						KkcLanguageModelEntry* _tmp17_ = NULL;
-						gint _tmp17__length1 = 0;
-						gint _tmp18_ = 0;
+						KkcNbestNode* _tmp12_ = NULL;
+						KkcTrellisNode* _tmp13_ = NULL;
+						KkcLanguageModelEntry* _tmp14_ = NULL;
+						gint _tmp14__length1 = 0;
+						KkcLanguageModelEntry* _tmp15_ = NULL;
+						gint _tmp15__length1 = 0;
+						gint _tmp16_ = 0;
+						KkcLanguageModelEntry _tmp17_ = {0};
+						KkcLanguageModelEntry _tmp18_ = {0};
+						KkcSegment* segment = NULL;
 						KkcLanguageModelEntry _tmp19_ = {0};
-						KkcLanguageModelEntry _tmp20_ = {0};
-						KkcSegment* segment = NULL;
+						const gchar* _tmp20_ = NULL;
 						KkcLanguageModelEntry _tmp21_ = {0};
 						const gchar* _tmp22_ = NULL;
-						KkcLanguageModelEntry _tmp23_ = {0};
-						const gchar* _tmp24_ = NULL;
-						KkcSegment* _tmp25_ = NULL;
-						KkcSegment* _tmp26_ = NULL;
-						KkcSegment* _tmp29_ = NULL;
-						KkcSegment* _tmp33_ = NULL;
-						KkcSegment* _tmp34_ = NULL;
-						_tmp7_ = _tmp6_;
-						if (!_tmp7_) {
-							gint _tmp8_ = 0;
-							_tmp8_ = i;
-							i = _tmp8_ + 1;
+						KkcSegment* _tmp23_ = NULL;
+						KkcSegment* _tmp24_ = NULL;
+						KkcSegment* _tmp27_ = NULL;
+						KkcSegment* _tmp31_ = NULL;
+						KkcSegment* _tmp32_ = NULL;
+						if (!_tmp5_) {
+							gint _tmp6_ = 0;
+							_tmp6_ = i;
+							i = _tmp6_ + 1;
 						}
-						_tmp6_ = FALSE;
-						_tmp9_ = i;
-						_tmp10_ = nbest_node;
-						_tmp11_ = _tmp10_->node;
-						_tmp12_ = kkc_trellis_node_get_entries (_tmp11_, &_tmp12__length1);
-						_tmp13_ = _tmp12_;
-						_tmp13__length1 = _tmp12__length1;
-						if (!(_tmp9_ < _tmp13__length1)) {
+						_tmp5_ = FALSE;
+						_tmp7_ = i;
+						_tmp8_ = nbest_node;
+						_tmp9_ = _tmp8_->node;
+						_tmp10_ = kkc_trellis_node_get_entries (_tmp9_, &_tmp10__length1);
+						_tmp11_ = _tmp10_;
+						_tmp11__length1 = _tmp10__length1;
+						if (!(_tmp7_ < _tmp11__length1)) {
 							break;
 						}
-						_tmp14_ = nbest_node;
-						_tmp15_ = _tmp14_->node;
-						_tmp16_ = kkc_trellis_node_get_entries (_tmp15_, &_tmp16__length1);
-						_tmp17_ = _tmp16_;
-						_tmp17__length1 = _tmp16__length1;
-						_tmp18_ = i;
-						_tmp19_ = _tmp17_[_tmp18_];
-						kkc_language_model_entry_copy (&_tmp19_, &_tmp20_);
-						entry = _tmp20_;
+						_tmp12_ = nbest_node;
+						_tmp13_ = _tmp12_->node;
+						_tmp14_ = kkc_trellis_node_get_entries (_tmp13_, &_tmp14__length1);
+						_tmp15_ = _tmp14_;
+						_tmp15__length1 = _tmp14__length1;
+						_tmp16_ = i;
+						_tmp17_ = _tmp15_[_tmp16_];
+						kkc_language_model_entry_copy (&_tmp17_, &_tmp18_);
+						entry = _tmp18_;
+						_tmp19_ = entry;
+						_tmp20_ = _tmp19_.input;
 						_tmp21_ = entry;
-						_tmp22_ = _tmp21_.input;
-						_tmp23_ = entry;
-						_tmp24_ = _tmp23_.output;
-						_tmp25_ = kkc_segment_new (_tmp22_, _tmp24_);
-						segment = _tmp25_;
-						_tmp26_ = start_segment;
-						if (_tmp26_ == NULL) {
-							KkcSegment* _tmp27_ = NULL;
+						_tmp22_ = _tmp21_.output;
+						_tmp23_ = kkc_segment_new (_tmp20_, _tmp22_);
+						segment = _tmp23_;
+						_tmp24_ = start_segment;
+						if (_tmp24_ == NULL) {
+							KkcSegment* _tmp25_ = NULL;
+							KkcSegment* _tmp26_ = NULL;
+							_tmp25_ = segment;
+							_tmp26_ = _g_object_ref0 (_tmp25_);
+							_g_object_unref0 (start_segment);
+							start_segment = _tmp26_;
+						}
+						_tmp27_ = previous_segment;
+						if (_tmp27_ != NULL) {
 							KkcSegment* _tmp28_ = NULL;
-							_tmp27_ = segment;
-							_tmp28_ = _g_object_ref0 (_tmp27_);
-							_g_object_unref0 (start_segment);
-							start_segment = _tmp28_;
-						}
-						_tmp29_ = previous_segment;
-						if (_tmp29_ != NULL) {
+							KkcSegment* _tmp29_ = NULL;
 							KkcSegment* _tmp30_ = NULL;
-							KkcSegment* _tmp31_ = NULL;
-							KkcSegment* _tmp32_ = NULL;
-							_tmp30_ = previous_segment;
-							_tmp31_ = segment;
-							_tmp32_ = _g_object_ref0 (_tmp31_);
-							_g_object_unref0 (_tmp30_->next);
-							_tmp30_->next = _tmp32_;
+							_tmp28_ = previous_segment;
+							_tmp29_ = segment;
+							_tmp30_ = _g_object_ref0 (_tmp29_);
+							_g_object_unref0 (_tmp28_->next);
+							_tmp28_->next = _tmp30_;
 						}
-						_tmp33_ = segment;
-						_tmp34_ = _g_object_ref0 (_tmp33_);
+						_tmp31_ = segment;
+						_tmp32_ = _g_object_ref0 (_tmp31_);
 						_g_object_unref0 (previous_segment);
-						previous_segment = _tmp34_;
+						previous_segment = _tmp32_;
 						_g_object_unref0 (segment);
 						kkc_language_model_entry_destroy (&entry);
 					}
@@ -1709,6 +1673,13 @@
 }
 
 
+static gint _kkc_bigram_decoder_compare_nbest_node_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+	gint result;
+	result = kkc_bigram_decoder_compare_nbest_node ((KkcNbestNode*) a, (KkcNbestNode*) b);
+	return result;
+}
+
+
 static gpointer _kkc_nbest_node_ref0 (gpointer self) {
 	return self ? kkc_nbest_node_ref (self) : NULL;
 }
@@ -1730,32 +1701,28 @@
 	gpointer _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	GeeHashMap* trellis_nbest_map = NULL;
-	GHashFunc _tmp49_ = NULL;
-	GEqualFunc _tmp50_ = NULL;
-	GeeHashMap* _tmp51_ = NULL;
+	GeeHashMap* _tmp47_ = NULL;
 	GeePriorityQueue* open_list = NULL;
-	GeePriorityQueue* _tmp52_ = NULL;
+	GeePriorityQueue* _tmp48_ = NULL;
 	GeePriorityQueue* close_list = NULL;
-	GeePriorityQueue* _tmp53_ = NULL;
+	GeePriorityQueue* _tmp49_ = NULL;
 	GeeHashSet* duplicates = NULL;
-	GHashFunc _tmp54_ = NULL;
-	GEqualFunc _tmp55_ = NULL;
-	GeeHashSet* _tmp56_ = NULL;
+	GeeHashSet* _tmp50_ = NULL;
 	KkcNbestNode* eos_nbest_node = NULL;
-	KkcTrellisNode* _tmp57_ = NULL;
-	KkcNbestNode* _tmp58_ = NULL;
-	GeeHashMap* _tmp59_ = NULL;
-	KkcTrellisNode* _tmp60_ = NULL;
-	KkcNbestNode* _tmp61_ = NULL;
-	GeePriorityQueue* _tmp62_ = NULL;
-	KkcNbestNode* _tmp63_ = NULL;
+	KkcTrellisNode* _tmp51_ = NULL;
+	KkcNbestNode* _tmp52_ = NULL;
+	GeeHashMap* _tmp53_ = NULL;
+	KkcTrellisNode* _tmp54_ = NULL;
+	KkcNbestNode* _tmp55_ = NULL;
+	GeePriorityQueue* _tmp56_ = NULL;
+	KkcNbestNode* _tmp57_ = NULL;
 	GeeArrayList* segments = NULL;
-	GeeArrayList* _tmp151_ = NULL;
-	GeeArrayList* _tmp163_ = NULL;
-	gint _tmp164_ = 0;
-	gpointer* _tmp165_ = NULL;
-	KkcSegment** _tmp166_ = NULL;
-	gint _tmp166__length1 = 0;
+	GeeArrayList* _tmp144_ = NULL;
+	GeeArrayList* _tmp156_ = NULL;
+	gint _tmp157_ = 0;
+	gpointer* _tmp158_ = NULL;
+	KkcSegment** _tmp159_ = NULL;
+	gint _tmp159__length1 = 0;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = trellis;
 	_tmp0__length1 = trellis_length1;
@@ -1773,11 +1740,11 @@
 	if (_tmp7_ == 1) {
 		KkcSegment* segment = NULL;
 		KkcSegment* next_segment = NULL;
-		KkcSegment* _tmp45_ = NULL;
-		KkcSegment* _tmp46_ = NULL;
-		KkcSegment** _tmp47_ = NULL;
-		KkcSegment** _tmp48_ = NULL;
-		gint _tmp48__length1 = 0;
+		KkcSegment* _tmp43_ = NULL;
+		KkcSegment* _tmp44_ = NULL;
+		KkcSegment** _tmp45_ = NULL;
+		KkcSegment** _tmp46_ = NULL;
+		gint _tmp46__length1 = 0;
 		segment = NULL;
 		next_segment = NULL;
 		{
@@ -1793,110 +1760,106 @@
 				gboolean _tmp11_ = FALSE;
 				_tmp11_ = TRUE;
 				while (TRUE) {
-					gboolean _tmp12_ = FALSE;
-					KkcTrellisNode* _tmp16_ = NULL;
-					_tmp12_ = _tmp11_;
-					if (!_tmp12_) {
+					KkcTrellisNode* _tmp15_ = NULL;
+					if (!_tmp11_) {
+						KkcTrellisNode* _tmp12_ = NULL;
 						KkcTrellisNode* _tmp13_ = NULL;
 						KkcTrellisNode* _tmp14_ = NULL;
-						KkcTrellisNode* _tmp15_ = NULL;
-						_tmp13_ = node;
-						_tmp14_ = _tmp13_->previous;
-						_tmp15_ = _kkc_trellis_node_ref0 (_tmp14_);
+						_tmp12_ = node;
+						_tmp13_ = _tmp12_->previous;
+						_tmp14_ = _kkc_trellis_node_ref0 (_tmp13_);
 						_kkc_trellis_node_unref0 (node);
-						node = _tmp15_;
+						node = _tmp14_;
 					}
 					_tmp11_ = FALSE;
-					_tmp16_ = node;
-					if (!(_tmp16_ != NULL)) {
+					_tmp15_ = node;
+					if (!(_tmp15_ != NULL)) {
 						break;
 					}
 					{
 						gint i = 0;
-						KkcTrellisNode* _tmp17_ = NULL;
+						KkcTrellisNode* _tmp16_ = NULL;
+						KkcLanguageModelEntry* _tmp17_ = NULL;
+						gint _tmp17__length1 = 0;
 						KkcLanguageModelEntry* _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
-						KkcLanguageModelEntry* _tmp19_ = NULL;
-						gint _tmp19__length1 = 0;
-						_tmp17_ = node;
-						_tmp18_ = kkc_trellis_node_get_entries (_tmp17_, &_tmp18__length1);
-						_tmp19_ = _tmp18_;
-						_tmp19__length1 = _tmp18__length1;
-						i = _tmp19__length1 - 1;
+						_tmp16_ = node;
+						_tmp17_ = kkc_trellis_node_get_entries (_tmp16_, &_tmp17__length1);
+						_tmp18_ = _tmp17_;
+						_tmp18__length1 = _tmp17__length1;
+						i = _tmp18__length1 - 1;
 						{
-							gboolean _tmp20_ = FALSE;
-							_tmp20_ = TRUE;
+							gboolean _tmp19_ = FALSE;
+							_tmp19_ = TRUE;
 							while (TRUE) {
-								gboolean _tmp21_ = FALSE;
-								gint _tmp23_ = 0;
+								gint _tmp21_ = 0;
 								KkcLanguageModelEntry entry = {0};
-								KkcTrellisNode* _tmp24_ = NULL;
-								KkcLanguageModelEntry* _tmp25_ = NULL;
-								gint _tmp25__length1 = 0;
-								KkcLanguageModelEntry* _tmp26_ = NULL;
-								gint _tmp26__length1 = 0;
-								gint _tmp27_ = 0;
+								KkcTrellisNode* _tmp22_ = NULL;
+								KkcLanguageModelEntry* _tmp23_ = NULL;
+								gint _tmp23__length1 = 0;
+								KkcLanguageModelEntry* _tmp24_ = NULL;
+								gint _tmp24__length1 = 0;
+								gint _tmp25_ = 0;
+								KkcLanguageModelEntry _tmp26_ = {0};
+								KkcLanguageModelEntry _tmp27_ = {0};
 								KkcLanguageModelEntry _tmp28_ = {0};
-								KkcLanguageModelEntry _tmp29_ = {0};
-								KkcLanguageModelEntry _tmp30_ = {0};
-								KkcBigramLanguageModel* _tmp31_ = NULL;
-								KkcBigramLanguageModel* _tmp32_ = NULL;
+								KkcBigramLanguageModel* _tmp29_ = NULL;
+								KkcBigramLanguageModel* _tmp30_ = NULL;
+								KkcLanguageModelEntry _tmp31_ = {0};
+								KkcLanguageModelEntry _tmp32_ = {0};
 								KkcLanguageModelEntry _tmp33_ = {0};
-								KkcLanguageModelEntry _tmp34_ = {0};
+								const gchar* _tmp34_ = NULL;
 								KkcLanguageModelEntry _tmp35_ = {0};
 								const gchar* _tmp36_ = NULL;
-								KkcLanguageModelEntry _tmp37_ = {0};
-								const gchar* _tmp38_ = NULL;
+								KkcSegment* _tmp37_ = NULL;
+								KkcSegment* _tmp38_ = NULL;
 								KkcSegment* _tmp39_ = NULL;
 								KkcSegment* _tmp40_ = NULL;
 								KkcSegment* _tmp41_ = NULL;
 								KkcSegment* _tmp42_ = NULL;
-								KkcSegment* _tmp43_ = NULL;
-								KkcSegment* _tmp44_ = NULL;
-								_tmp21_ = _tmp20_;
-								if (!_tmp21_) {
-									gint _tmp22_ = 0;
-									_tmp22_ = i;
-									i = _tmp22_ - 1;
+								if (!_tmp19_) {
+									gint _tmp20_ = 0;
+									_tmp20_ = i;
+									i = _tmp20_ - 1;
 								}
-								_tmp20_ = FALSE;
-								_tmp23_ = i;
-								if (!(_tmp23_ >= 0)) {
+								_tmp19_ = FALSE;
+								_tmp21_ = i;
+								if (!(_tmp21_ >= 0)) {
 									break;
 								}
-								_tmp24_ = node;
-								_tmp25_ = kkc_trellis_node_get_entries (_tmp24_, &_tmp25__length1);
-								_tmp26_ = _tmp25_;
-								_tmp26__length1 = _tmp25__length1;
-								_tmp27_ = i;
-								_tmp28_ = _tmp26_[_tmp27_];
-								kkc_language_model_entry_copy (&_tmp28_, &_tmp29_);
-								entry = _tmp29_;
-								_tmp30_ = entry;
-								_tmp31_ = kkc_bigram_decoder_get_model (self);
+								_tmp22_ = node;
+								_tmp23_ = kkc_trellis_node_get_entries (_tmp22_, &_tmp23__length1);
+								_tmp24_ = _tmp23_;
+								_tmp24__length1 = _tmp23__length1;
+								_tmp25_ = i;
+								_tmp26_ = _tmp24_[_tmp25_];
+								kkc_language_model_entry_copy (&_tmp26_, &_tmp27_);
+								entry = _tmp27_;
+								_tmp28_ = entry;
+								_tmp29_ = kkc_bigram_decoder_get_model (self);
+								_tmp30_ = _tmp29_;
+								kkc_language_model_get_bos ((KkcLanguageModel*) _tmp30_, &_tmp31_);
 								_tmp32_ = _tmp31_;
-								kkc_language_model_get_bos ((KkcLanguageModel*) _tmp32_, &_tmp33_);
-								_tmp34_ = _tmp33_;
-								if (_kkc_language_model_entry_equal (&_tmp30_, &_tmp34_) == TRUE) {
+								if (_kkc_language_model_entry_equal (&_tmp28_, &_tmp32_) == TRUE) {
 									kkc_language_model_entry_destroy (&entry);
 									break;
 								}
+								_tmp33_ = entry;
+								_tmp34_ = _tmp33_.input;
 								_tmp35_ = entry;
-								_tmp36_ = _tmp35_.input;
-								_tmp37_ = entry;
-								_tmp38_ = _tmp37_.output;
-								_tmp39_ = kkc_segment_new (_tmp36_, _tmp38_);
+								_tmp36_ = _tmp35_.output;
+								_tmp37_ = kkc_segment_new (_tmp34_, _tmp36_);
 								_g_object_unref0 (segment);
-								segment = _tmp39_;
-								_tmp40_ = segment;
-								_tmp41_ = next_segment;
+								segment = _tmp37_;
+								_tmp38_ = segment;
+								_tmp39_ = next_segment;
+								_tmp40_ = _g_object_ref0 (_tmp39_);
+								_g_object_unref0 (_tmp38_->next);
+								_tmp38_->next = _tmp40_;
+								_tmp41_ = segment;
 								_tmp42_ = _g_object_ref0 (_tmp41_);
-								_g_object_unref0 (_tmp40_->next);
-								_tmp40_->next = _tmp42_;
-								_tmp43_ = segment;
-								_tmp44_ = _g_object_ref0 (_tmp43_);
 								_g_object_unref0 (next_segment);
-								next_segment = _tmp44_;
+								next_segment = _tmp42_;
 								kkc_language_model_entry_destroy (&entry);
 							}
 						}
@@ -1905,281 +1868,275 @@
 			}
 			_kkc_trellis_node_unref0 (node);
 		}
-		_tmp45_ = segment;
-		_tmp46_ = _g_object_ref0 (_tmp45_);
-		_tmp47_ = g_new0 (KkcSegment*, 1 + 1);
-		_tmp47_[0] = _tmp46_;
-		_tmp48_ = _tmp47_;
-		_tmp48__length1 = 1;
+		_tmp43_ = segment;
+		_tmp44_ = _g_object_ref0 (_tmp43_);
+		_tmp45_ = g_new0 (KkcSegment*, 1 + 1);
+		_tmp45_[0] = _tmp44_;
+		_tmp46_ = _tmp45_;
+		_tmp46__length1 = 1;
 		if (result_length1) {
-			*result_length1 = _tmp48__length1;
+			*result_length1 = _tmp46__length1;
 		}
-		result = _tmp48_;
+		result = _tmp46_;
 		_g_object_unref0 (next_segment);
 		_g_object_unref0 (segment);
 		_kkc_trellis_node_unref0 (eos_trellis_node);
 		_kkc_trellis_node_unref0 (bos_trellis_node);
 		return result;
 	}
-	_tmp49_ = g_direct_hash;
-	_tmp50_ = g_direct_equal;
-	_tmp51_ = gee_hash_map_new (KKC_TYPE_TRELLIS_NODE, (GBoxedCopyFunc) kkc_trellis_node_ref, kkc_trellis_node_unref, KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, _tmp49_, _tmp50_, NULL);
-	trellis_nbest_map = _tmp51_;
-	_tmp52_ = gee_priority_queue_new (KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, (GCompareFunc) kkc_bigram_decoder_compare_nbest_node);
-	open_list = _tmp52_;
-	_tmp53_ = gee_priority_queue_new (KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, (GCompareFunc) kkc_bigram_decoder_compare_nbest_node);
-	close_list = _tmp53_;
-	_tmp54_ = g_str_hash;
-	_tmp55_ = g_str_equal;
-	_tmp56_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, _tmp54_, _tmp55_);
-	duplicates = _tmp56_;
-	_tmp57_ = eos_trellis_node;
-	_tmp58_ = kkc_nbest_node_new (_tmp57_);
-	eos_nbest_node = _tmp58_;
-	_tmp59_ = trellis_nbest_map;
-	_tmp60_ = eos_trellis_node;
-	_tmp61_ = eos_nbest_node;
-	gee_abstract_map_set ((GeeAbstractMap*) _tmp59_, _tmp60_, _tmp61_);
-	_tmp62_ = open_list;
-	_tmp63_ = eos_nbest_node;
-	gee_abstract_collection_add ((GeeAbstractCollection*) _tmp62_, _tmp63_);
+	_tmp47_ = gee_hash_map_new (KKC_TYPE_TRELLIS_NODE, (GBoxedCopyFunc) kkc_trellis_node_ref, kkc_trellis_node_unref, KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	trellis_nbest_map = _tmp47_;
+	_tmp48_ = gee_priority_queue_new (KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, _kkc_bigram_decoder_compare_nbest_node_gcompare_data_func, NULL, NULL);
+	open_list = _tmp48_;
+	_tmp49_ = gee_priority_queue_new (KKC_TYPE_NBEST_NODE, (GBoxedCopyFunc) kkc_nbest_node_ref, kkc_nbest_node_unref, _kkc_bigram_decoder_compare_nbest_node_gcompare_data_func, NULL, NULL);
+	close_list = _tmp49_;
+	_tmp50_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	duplicates = _tmp50_;
+	_tmp51_ = eos_trellis_node;
+	_tmp52_ = kkc_nbest_node_new (_tmp51_);
+	eos_nbest_node = _tmp52_;
+	_tmp53_ = trellis_nbest_map;
+	_tmp54_ = eos_trellis_node;
+	_tmp55_ = eos_nbest_node;
+	gee_abstract_map_set ((GeeAbstractMap*) _tmp53_, _tmp54_, _tmp55_);
+	_tmp56_ = open_list;
+	_tmp57_ = eos_nbest_node;
+	gee_abstract_collection_add ((GeeAbstractCollection*) _tmp56_, _tmp57_);
 	while (TRUE) {
-		GeePriorityQueue* _tmp64_ = NULL;
-		gboolean _tmp65_ = FALSE;
-		gboolean _tmp66_ = FALSE;
+		GeePriorityQueue* _tmp58_ = NULL;
+		gboolean _tmp59_ = FALSE;
+		gboolean _tmp60_ = FALSE;
 		KkcNbestNode* current_nbest_node = NULL;
-		GeePriorityQueue* _tmp67_ = NULL;
-		gpointer _tmp68_ = NULL;
-		KkcNbestNode* _tmp69_ = NULL;
-		KkcTrellisNode* _tmp70_ = NULL;
-		KkcTrellisNode* _tmp71_ = NULL;
-		_tmp64_ = open_list;
-		_tmp65_ = gee_abstract_collection_get_is_empty ((GeeAbstractCollection*) _tmp64_);
-		_tmp66_ = _tmp65_;
-		if (!(!_tmp66_)) {
+		GeePriorityQueue* _tmp61_ = NULL;
+		gpointer _tmp62_ = NULL;
+		KkcNbestNode* _tmp63_ = NULL;
+		KkcTrellisNode* _tmp64_ = NULL;
+		KkcTrellisNode* _tmp65_ = NULL;
+		_tmp58_ = open_list;
+		_tmp59_ = gee_collection_get_is_empty ((GeeCollection*) _tmp58_);
+		_tmp60_ = _tmp59_;
+		if (!(!_tmp60_)) {
 			break;
 		}
-		_tmp67_ = open_list;
-		_tmp68_ = gee_abstract_queue_poll ((GeeAbstractQueue*) _tmp67_);
-		current_nbest_node = (KkcNbestNode*) _tmp68_;
-		_tmp69_ = current_nbest_node;
-		_tmp70_ = _tmp69_->node;
-		_tmp71_ = bos_trellis_node;
-		if (_tmp70_ == _tmp71_) {
+		_tmp61_ = open_list;
+		_tmp62_ = gee_abstract_queue_poll ((GeeAbstractQueue*) _tmp61_);
+		current_nbest_node = (KkcNbestNode*) _tmp62_;
+		_tmp63_ = current_nbest_node;
+		_tmp64_ = _tmp63_->node;
+		_tmp65_ = bos_trellis_node;
+		if (_tmp64_ == _tmp65_) {
 			gchar* output = NULL;
-			KkcNbestNode* _tmp72_ = NULL;
-			gchar* _tmp73_ = NULL;
-			GeeHashSet* _tmp74_ = NULL;
-			const gchar* _tmp75_ = NULL;
-			gboolean _tmp76_ = FALSE;
-			_tmp72_ = current_nbest_node;
-			_tmp73_ = kkc_bigram_decoder_concat_nbest_node_outputs (self, _tmp72_);
-			output = _tmp73_;
-			_tmp74_ = duplicates;
-			_tmp75_ = output;
-			_tmp76_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp74_, _tmp75_);
-			if (!_tmp76_) {
-				KkcTrellisNode* _tmp77_ = NULL;
-				gdouble _tmp78_ = 0.0;
-				KkcNbestNode* _tmp79_ = NULL;
-				gdouble _tmp80_ = 0.0;
-				gdouble _tmp81_ = 0.0;
-				GeePriorityQueue* _tmp82_ = NULL;
-				KkcNbestNode* _tmp83_ = NULL;
-				GeePriorityQueue* _tmp84_ = NULL;
-				gint _tmp85_ = 0;
-				gint _tmp86_ = 0;
-				gint _tmp87_ = 0;
-				GeeHashSet* _tmp88_ = NULL;
-				const gchar* _tmp89_ = NULL;
-				_tmp77_ = eos_trellis_node;
-				_tmp78_ = _tmp77_->cumulative_cost;
-				_tmp79_ = current_nbest_node;
-				_tmp80_ = _tmp79_->fn;
-				_tmp81_ = max_distance;
-				if ((_tmp78_ - _tmp80_) > _tmp81_) {
-					_g_free0 (output);
-					_kkc_nbest_node_unref0 (current_nbest_node);
-					break;
-				}
-				_tmp82_ = close_list;
-				_tmp83_ = current_nbest_node;
+			KkcNbestNode* _tmp66_ = NULL;
+			gchar* _tmp67_ = NULL;
+			GeeHashSet* _tmp68_ = NULL;
+			const gchar* _tmp69_ = NULL;
+			gboolean _tmp70_ = FALSE;
+			_tmp66_ = current_nbest_node;
+			_tmp67_ = kkc_bigram_decoder_concat_nbest_node_outputs (self, _tmp66_);
+			output = _tmp67_;
+			_tmp68_ = duplicates;
+			_tmp69_ = output;
+			_tmp70_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp68_, _tmp69_);
+			if (!_tmp70_) {
+				KkcTrellisNode* _tmp71_ = NULL;
+				gdouble _tmp72_ = 0.0;
+				KkcNbestNode* _tmp73_ = NULL;
+				gdouble _tmp74_ = 0.0;
+				gdouble _tmp75_ = 0.0;
+				GeePriorityQueue* _tmp76_ = NULL;
+				KkcNbestNode* _tmp77_ = NULL;
+				GeePriorityQueue* _tmp78_ = NULL;
+				gint _tmp79_ = 0;
+				gint _tmp80_ = 0;
+				gint _tmp81_ = 0;
+				GeeHashSet* _tmp82_ = NULL;
+				const gchar* _tmp83_ = NULL;
+				_tmp71_ = eos_trellis_node;
+				_tmp72_ = _tmp71_->cumulative_cost;
+				_tmp73_ = current_nbest_node;
+				_tmp74_ = _tmp73_->fn;
+				_tmp75_ = max_distance;
+				if ((_tmp72_ - _tmp74_) > _tmp75_) {
+					_g_free0 (output);
+					_kkc_nbest_node_unref0 (current_nbest_node);
+					break;
+				}
+				_tmp76_ = close_list;
+				_tmp77_ = current_nbest_node;
+				gee_abstract_collection_add ((GeeAbstractCollection*) _tmp76_, _tmp77_);
+				_tmp78_ = close_list;
+				_tmp79_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp78_);
+				_tmp80_ = _tmp79_;
+				_tmp81_ = nbest;
+				if (_tmp80_ == _tmp81_) {
+					_g_free0 (output);
+					_kkc_nbest_node_unref0 (current_nbest_node);
+					break;
+				}
+				_tmp82_ = duplicates;
+				_tmp83_ = output;
 				gee_abstract_collection_add ((GeeAbstractCollection*) _tmp82_, _tmp83_);
-				_tmp84_ = close_list;
-				_tmp85_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp84_);
-				_tmp86_ = _tmp85_;
-				_tmp87_ = nbest;
-				if (_tmp86_ == _tmp87_) {
-					_g_free0 (output);
-					_kkc_nbest_node_unref0 (current_nbest_node);
-					break;
-				}
-				_tmp88_ = duplicates;
-				_tmp89_ = output;
-				gee_abstract_collection_add ((GeeAbstractCollection*) _tmp88_, _tmp89_);
 			}
 			_g_free0 (output);
 		} else {
-			KkcNbestNode* _tmp90_ = NULL;
-			KkcTrellisNode* _tmp91_ = NULL;
-			guint _tmp92_ = 0U;
-			guint _tmp93_ = 0U;
-			KkcNbestNode* _tmp94_ = NULL;
-			KkcTrellisNode* _tmp95_ = NULL;
-			guint _tmp96_ = 0U;
-			guint _tmp97_ = 0U;
-			_tmp90_ = current_nbest_node;
-			_tmp91_ = _tmp90_->node;
-			_tmp92_ = kkc_trellis_node_get_endpos (_tmp91_);
-			_tmp93_ = _tmp92_;
-			_tmp94_ = current_nbest_node;
-			_tmp95_ = _tmp94_->node;
-			_tmp96_ = kkc_trellis_node_get_length (_tmp95_);
-			_tmp97_ = _tmp96_;
-			if (_tmp93_ >= _tmp97_) {
+			KkcNbestNode* _tmp84_ = NULL;
+			KkcTrellisNode* _tmp85_ = NULL;
+			guint _tmp86_ = 0U;
+			guint _tmp87_ = 0U;
+			KkcNbestNode* _tmp88_ = NULL;
+			KkcTrellisNode* _tmp89_ = NULL;
+			guint _tmp90_ = 0U;
+			guint _tmp91_ = 0U;
+			_tmp84_ = current_nbest_node;
+			_tmp85_ = _tmp84_->node;
+			_tmp86_ = kkc_trellis_node_get_endpos (_tmp85_);
+			_tmp87_ = _tmp86_;
+			_tmp88_ = current_nbest_node;
+			_tmp89_ = _tmp88_->node;
+			_tmp90_ = kkc_trellis_node_get_length (_tmp89_);
+			_tmp91_ = _tmp90_;
+			if (_tmp87_ >= _tmp91_) {
 				guint i = 0U;
-				KkcNbestNode* _tmp98_ = NULL;
-				KkcTrellisNode* _tmp99_ = NULL;
-				guint _tmp100_ = 0U;
-				guint _tmp101_ = 0U;
-				KkcNbestNode* _tmp102_ = NULL;
-				KkcTrellisNode* _tmp103_ = NULL;
-				guint _tmp104_ = 0U;
-				guint _tmp105_ = 0U;
-				_tmp98_ = current_nbest_node;
-				_tmp99_ = _tmp98_->node;
-				_tmp100_ = kkc_trellis_node_get_endpos (_tmp99_);
-				_tmp101_ = _tmp100_;
-				_tmp102_ = current_nbest_node;
-				_tmp103_ = _tmp102_->node;
-				_tmp104_ = kkc_trellis_node_get_length (_tmp103_);
-				_tmp105_ = _tmp104_;
-				i = ((gint) _tmp101_) - _tmp105_;
+				KkcNbestNode* _tmp92_ = NULL;
+				KkcTrellisNode* _tmp93_ = NULL;
+				guint _tmp94_ = 0U;
+				guint _tmp95_ = 0U;
+				KkcNbestNode* _tmp96_ = NULL;
+				KkcTrellisNode* _tmp97_ = NULL;
+				guint _tmp98_ = 0U;
+				guint _tmp99_ = 0U;
+				_tmp92_ = current_nbest_node;
+				_tmp93_ = _tmp92_->node;
+				_tmp94_ = kkc_trellis_node_get_endpos (_tmp93_);
+				_tmp95_ = _tmp94_;
+				_tmp96_ = current_nbest_node;
+				_tmp97_ = _tmp96_->node;
+				_tmp98_ = kkc_trellis_node_get_length (_tmp97_);
+				_tmp99_ = _tmp98_;
+				i = ((gint) _tmp95_) - _tmp99_;
 				{
 					GeeArrayList* _trellis_node_list = NULL;
-					GeeArrayList** _tmp106_ = NULL;
-					gint _tmp106__length1 = 0;
-					guint _tmp107_ = 0U;
-					GeeArrayList* _tmp108_ = NULL;
-					GeeArrayList* _tmp109_ = NULL;
+					GeeArrayList** _tmp100_ = NULL;
+					gint _tmp100__length1 = 0;
+					guint _tmp101_ = 0U;
+					GeeArrayList* _tmp102_ = NULL;
+					GeeArrayList* _tmp103_ = NULL;
 					gint _trellis_node_size = 0;
-					GeeArrayList* _tmp110_ = NULL;
-					gint _tmp111_ = 0;
-					gint _tmp112_ = 0;
+					GeeArrayList* _tmp104_ = NULL;
+					gint _tmp105_ = 0;
+					gint _tmp106_ = 0;
 					gint _trellis_node_index = 0;
-					_tmp106_ = trellis;
-					_tmp106__length1 = trellis_length1;
-					_tmp107_ = i;
-					_tmp108_ = _tmp106_[_tmp107_];
-					_tmp109_ = _g_object_ref0 (_tmp108_);
-					_trellis_node_list = _tmp109_;
-					_tmp110_ = _trellis_node_list;
-					_tmp111_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp110_);
-					_tmp112_ = _tmp111_;
-					_trellis_node_size = _tmp112_;
+					_tmp100_ = trellis;
+					_tmp100__length1 = trellis_length1;
+					_tmp101_ = i;
+					_tmp102_ = _tmp100_[_tmp101_];
+					_tmp103_ = _g_object_ref0 (_tmp102_);
+					_trellis_node_list = _tmp103_;
+					_tmp104_ = _trellis_node_list;
+					_tmp105_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp104_);
+					_tmp106_ = _tmp105_;
+					_trellis_node_size = _tmp106_;
 					_trellis_node_index = -1;
 					while (TRUE) {
-						gint _tmp113_ = 0;
-						gint _tmp114_ = 0;
-						gint _tmp115_ = 0;
+						gint _tmp107_ = 0;
+						gint _tmp108_ = 0;
+						gint _tmp109_ = 0;
 						KkcTrellisNode* trellis_node = NULL;
-						GeeArrayList* _tmp116_ = NULL;
-						gint _tmp117_ = 0;
-						gpointer _tmp118_ = NULL;
+						GeeArrayList* _tmp110_ = NULL;
+						gint _tmp111_ = 0;
+						gpointer _tmp112_ = NULL;
 						KkcNbestNode* nbest_node = NULL;
-						KkcTrellisNode* _tmp119_ = NULL;
-						KkcNbestNode* _tmp120_ = NULL;
+						KkcTrellisNode* _tmp113_ = NULL;
+						KkcNbestNode* _tmp114_ = NULL;
 						gdouble cost = 0.0;
-						KkcNbestNode* _tmp121_ = NULL;
+						KkcNbestNode* _tmp115_ = NULL;
+						KkcTrellisNode* _tmp116_ = NULL;
+						KkcNbestNode* _tmp117_ = NULL;
+						KkcTrellisNode* _tmp118_ = NULL;
+						guint _tmp119_ = 0U;
+						gdouble _tmp120_ = 0.0;
+						gboolean _tmp121_ = FALSE;
 						KkcTrellisNode* _tmp122_ = NULL;
-						KkcNbestNode* _tmp123_ = NULL;
-						KkcTrellisNode* _tmp124_ = NULL;
-						guint _tmp125_ = 0U;
-						gdouble _tmp126_ = 0.0;
-						gboolean _tmp127_ = FALSE;
-						KkcTrellisNode* _tmp128_ = NULL;
-						KkcTrellisNode* _tmp129_ = NULL;
-						gboolean _tmp132_ = FALSE;
+						KkcTrellisNode* _tmp123_ = NULL;
+						KkcNbestNode* _tmp126_ = NULL;
+						gdouble _tmp127_ = 0.0;
+						KkcNbestNode* _tmp128_ = NULL;
+						gdouble _tmp129_ = 0.0;
+						KkcNbestNode* _tmp130_ = NULL;
+						KkcNbestNode* _tmp131_ = NULL;
+						gdouble _tmp132_ = 0.0;
 						KkcNbestNode* _tmp133_ = NULL;
-						gdouble _tmp134_ = 0.0;
-						KkcNbestNode* _tmp135_ = NULL;
-						gdouble _tmp136_ = 0.0;
+						KkcTrellisNode* _tmp134_ = NULL;
+						gdouble _tmp135_ = 0.0;
+						KkcNbestNode* _tmp136_ = NULL;
 						KkcNbestNode* _tmp137_ = NULL;
 						KkcNbestNode* _tmp138_ = NULL;
-						gdouble _tmp139_ = 0.0;
-						KkcNbestNode* _tmp140_ = NULL;
-						KkcTrellisNode* _tmp141_ = NULL;
-						gdouble _tmp142_ = 0.0;
+						GeeHashMap* _tmp139_ = NULL;
+						KkcTrellisNode* _tmp140_ = NULL;
+						KkcNbestNode* _tmp141_ = NULL;
+						GeePriorityQueue* _tmp142_ = NULL;
 						KkcNbestNode* _tmp143_ = NULL;
-						KkcNbestNode* _tmp144_ = NULL;
-						KkcNbestNode* _tmp145_ = NULL;
-						GeeHashMap* _tmp146_ = NULL;
-						KkcTrellisNode* _tmp147_ = NULL;
-						KkcNbestNode* _tmp148_ = NULL;
-						GeePriorityQueue* _tmp149_ = NULL;
-						KkcNbestNode* _tmp150_ = NULL;
-						_tmp113_ = _trellis_node_index;
-						_trellis_node_index = _tmp113_ + 1;
-						_tmp114_ = _trellis_node_index;
-						_tmp115_ = _trellis_node_size;
-						if (!(_tmp114_ < _tmp115_)) {
+						_tmp107_ = _trellis_node_index;
+						_trellis_node_index = _tmp107_ + 1;
+						_tmp108_ = _trellis_node_index;
+						_tmp109_ = _trellis_node_size;
+						if (!(_tmp108_ < _tmp109_)) {
 							break;
 						}
-						_tmp116_ = _trellis_node_list;
-						_tmp117_ = _trellis_node_index;
-						_tmp118_ = gee_abstract_list_get ((GeeAbstractList*) _tmp116_, _tmp117_);
-						trellis_node = (KkcTrellisNode*) _tmp118_;
-						_tmp119_ = trellis_node;
-						_tmp120_ = kkc_nbest_node_new (_tmp119_);
-						nbest_node = _tmp120_;
-						_tmp121_ = nbest_node;
-						_tmp122_ = _tmp121_->node;
-						_tmp123_ = current_nbest_node;
-						_tmp124_ = _tmp123_->node;
-						_tmp125_ = i;
-						_tmp126_ = kkc_bigram_decoder_path_cost (self, _tmp122_, _tmp124_, (gint) _tmp125_);
-						cost = _tmp126_;
-						_tmp128_ = trellis_node;
-						_tmp129_ = bos_trellis_node;
-						if (_tmp128_ != _tmp129_) {
-							gdouble _tmp130_ = 0.0;
-							gdouble _tmp131_ = 0.0;
-							_tmp130_ = cost;
-							_tmp131_ = min_path_cost;
-							_tmp127_ = _tmp130_ < _tmp131_;
+						_tmp110_ = _trellis_node_list;
+						_tmp111_ = _trellis_node_index;
+						_tmp112_ = gee_abstract_list_get ((GeeAbstractList*) _tmp110_, _tmp111_);
+						trellis_node = (KkcTrellisNode*) _tmp112_;
+						_tmp113_ = trellis_node;
+						_tmp114_ = kkc_nbest_node_new (_tmp113_);
+						nbest_node = _tmp114_;
+						_tmp115_ = nbest_node;
+						_tmp116_ = _tmp115_->node;
+						_tmp117_ = current_nbest_node;
+						_tmp118_ = _tmp117_->node;
+						_tmp119_ = i;
+						_tmp120_ = kkc_bigram_decoder_path_cost (self, _tmp116_, _tmp118_, (gint) _tmp119_);
+						cost = _tmp120_;
+						_tmp122_ = trellis_node;
+						_tmp123_ = bos_trellis_node;
+						if (_tmp122_ != _tmp123_) {
+							gdouble _tmp124_ = 0.0;
+							gdouble _tmp125_ = 0.0;
+							_tmp124_ = cost;
+							_tmp125_ = min_path_cost;
+							_tmp121_ = _tmp124_ < _tmp125_;
 						} else {
-							_tmp127_ = FALSE;
+							_tmp121_ = FALSE;
 						}
-						_tmp132_ = _tmp127_;
-						if (_tmp132_) {
+						if (_tmp121_) {
 							_kkc_nbest_node_unref0 (nbest_node);
 							_kkc_trellis_node_unref0 (trellis_node);
 							continue;
 						}
+						_tmp126_ = nbest_node;
+						_tmp127_ = cost;
+						_tmp128_ = current_nbest_node;
+						_tmp129_ = _tmp128_->gn;
+						_tmp126_->gn = _tmp127_ + _tmp129_;
+						_tmp130_ = nbest_node;
+						_tmp131_ = nbest_node;
+						_tmp132_ = _tmp131_->gn;
 						_tmp133_ = nbest_node;
-						_tmp134_ = cost;
-						_tmp135_ = current_nbest_node;
-						_tmp136_ = _tmp135_->gn;
-						_tmp133_->gn = _tmp134_ + _tmp136_;
-						_tmp137_ = nbest_node;
-						_tmp138_ = nbest_node;
-						_tmp139_ = _tmp138_->gn;
-						_tmp140_ = nbest_node;
-						_tmp141_ = _tmp140_->node;
-						_tmp142_ = _tmp141_->cumulative_cost;
-						_tmp137_->fn = _tmp139_ + _tmp142_;
+						_tmp134_ = _tmp133_->node;
+						_tmp135_ = _tmp134_->cumulative_cost;
+						_tmp130_->fn = _tmp132_ + _tmp135_;
+						_tmp136_ = nbest_node;
+						_tmp137_ = current_nbest_node;
+						_tmp138_ = _kkc_nbest_node_ref0 (_tmp137_);
+						_kkc_nbest_node_unref0 (_tmp136_->next);
+						_tmp136_->next = _tmp138_;
+						_tmp139_ = trellis_nbest_map;
+						_tmp140_ = trellis_node;
+						_tmp141_ = nbest_node;
+						gee_abstract_map_set ((GeeAbstractMap*) _tmp139_, _tmp140_, _tmp141_);
+						_tmp142_ = open_list;
 						_tmp143_ = nbest_node;
-						_tmp144_ = current_nbest_node;
-						_tmp145_ = _kkc_nbest_node_ref0 (_tmp144_);
-						_kkc_nbest_node_unref0 (_tmp143_->next);
-						_tmp143_->next = _tmp145_;
-						_tmp146_ = trellis_nbest_map;
-						_tmp147_ = trellis_node;
-						_tmp148_ = nbest_node;
-						gee_abstract_map_set ((GeeAbstractMap*) _tmp146_, _tmp147_, _tmp148_);
-						_tmp149_ = open_list;
-						_tmp150_ = nbest_node;
-						gee_abstract_collection_add ((GeeAbstractCollection*) _tmp149_, _tmp150_);
+						gee_abstract_collection_add ((GeeAbstractCollection*) _tmp142_, _tmp143_);
 						_kkc_nbest_node_unref0 (nbest_node);
 						_kkc_trellis_node_unref0 (trellis_node);
 					}
@@ -2189,53 +2146,53 @@
 		}
 		_kkc_nbest_node_unref0 (current_nbest_node);
 	}
-	_tmp151_ = gee_array_list_new (KKC_TYPE_SEGMENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL);
-	segments = _tmp151_;
+	_tmp144_ = gee_array_list_new (KKC_TYPE_SEGMENT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	segments = _tmp144_;
 	{
 		GeeIterator* _nbest_node_it = NULL;
-		GeePriorityQueue* _tmp152_ = NULL;
-		GeeIterator* _tmp153_ = NULL;
-		_tmp152_ = close_list;
-		_tmp153_ = gee_abstract_collection_iterator ((GeeAbstractCollection*) _tmp152_);
-		_nbest_node_it = _tmp153_;
+		GeePriorityQueue* _tmp145_ = NULL;
+		GeeIterator* _tmp146_ = NULL;
+		_tmp145_ = close_list;
+		_tmp146_ = gee_abstract_collection_iterator ((GeeAbstractCollection*) _tmp145_);
+		_nbest_node_it = _tmp146_;
 		while (TRUE) {
-			GeeIterator* _tmp154_ = NULL;
-			gboolean _tmp155_ = FALSE;
+			GeeIterator* _tmp147_ = NULL;
+			gboolean _tmp148_ = FALSE;
 			KkcNbestNode* nbest_node = NULL;
-			GeeIterator* _tmp156_ = NULL;
-			gpointer _tmp157_ = NULL;
-			GeeArrayList* _tmp158_ = NULL;
-			KkcNbestNode* _tmp159_ = NULL;
-			KkcNbestNode* _tmp160_ = NULL;
-			KkcSegment* _tmp161_ = NULL;
-			KkcSegment* _tmp162_ = NULL;
-			_tmp154_ = _nbest_node_it;
-			_tmp155_ = gee_iterator_next (_tmp154_);
-			if (!_tmp155_) {
+			GeeIterator* _tmp149_ = NULL;
+			gpointer _tmp150_ = NULL;
+			GeeArrayList* _tmp151_ = NULL;
+			KkcNbestNode* _tmp152_ = NULL;
+			KkcNbestNode* _tmp153_ = NULL;
+			KkcSegment* _tmp154_ = NULL;
+			KkcSegment* _tmp155_ = NULL;
+			_tmp147_ = _nbest_node_it;
+			_tmp148_ = gee_iterator_next (_tmp147_);
+			if (!_tmp148_) {
 				break;
 			}
-			_tmp156_ = _nbest_node_it;
-			_tmp157_ = gee_iterator_get (_tmp156_);
-			nbest_node = (KkcNbestNode*) _tmp157_;
-			_tmp158_ = segments;
-			_tmp159_ = nbest_node;
-			_tmp160_ = _tmp159_->next;
-			_tmp161_ = kkc_bigram_decoder_nbest_node_to_segment (self, _tmp160_);
-			_tmp162_ = _tmp161_;
-			gee_abstract_collection_add ((GeeAbstractCollection*) _tmp158_, _tmp162_);
-			_g_object_unref0 (_tmp162_);
+			_tmp149_ = _nbest_node_it;
+			_tmp150_ = gee_iterator_get (_tmp149_);
+			nbest_node = (KkcNbestNode*) _tmp150_;
+			_tmp151_ = segments;
+			_tmp152_ = nbest_node;
+			_tmp153_ = _tmp152_->next;
+			_tmp154_ = kkc_bigram_decoder_nbest_node_to_segment (self, _tmp153_);
+			_tmp155_ = _tmp154_;
+			gee_abstract_collection_add ((GeeAbstractCollection*) _tmp151_, _tmp155_);
+			_g_object_unref0 (_tmp155_);
 			_kkc_nbest_node_unref0 (nbest_node);
 		}
 		_g_object_unref0 (_nbest_node_it);
 	}
-	_tmp163_ = segments;
-	_tmp165_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp163_, &_tmp164_);
-	_tmp166_ = _tmp165_;
-	_tmp166__length1 = _tmp164_;
+	_tmp156_ = segments;
+	_tmp158_ = gee_collection_to_array ((GeeCollection*) _tmp156_, &_tmp157_);
+	_tmp159_ = _tmp158_;
+	_tmp159__length1 = _tmp157_;
 	if (result_length1) {
-		*result_length1 = _tmp166__length1;
+		*result_length1 = _tmp159__length1;
 	}
-	result = _tmp166_;
+	result = _tmp159_;
 	_g_object_unref0 (segments);
 	_kkc_nbest_node_unref0 (eos_nbest_node);
 	_g_object_unref0 (duplicates);
@@ -2358,9 +2315,9 @@
 static void kkc_bigram_decoder_class_init (KkcBigramDecoderClass * klass) {
 	kkc_bigram_decoder_parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (KkcBigramDecoderPrivate));
-	KKC_DECODER_CLASS (klass)->decode = kkc_bigram_decoder_real_decode;
-	KKC_DECODER_CLASS (klass)->decode_with_costs = kkc_bigram_decoder_real_decode_with_costs;
-	KKC_BIGRAM_DECODER_CLASS (klass)->path_cost = kkc_bigram_decoder_real_path_cost;
+	((KkcDecoderClass *) klass)->decode = kkc_bigram_decoder_real_decode;
+	((KkcDecoderClass *) klass)->decode_with_costs = kkc_bigram_decoder_real_decode_with_costs;
+	((KkcBigramDecoderClass *) klass)->path_cost = kkc_bigram_decoder_real_path_cost;
 	G_OBJECT_CLASS (klass)->get_property = _vala_kkc_bigram_decoder_get_property;
 	G_OBJECT_CLASS (klass)->finalize = kkc_bigram_decoder_finalize;
 	g_object_class_install_property (G_OBJECT_CLASS (klass), KKC_BIGRAM_DECODER_MODEL, g_param_spec_object ("model", "model", "model", KKC_TYPE_BIGRAM_LANGUAGE_MODEL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 
=== modified file 'libkkc/bigram-decoder.vala'
--- libkkc/bigram-decoder.vala	2014-02-26 22:51:39 +0000
+++ libkkc/bigram-decoder.vala	2014-10-01 15:12:30 +0000
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2012-2013 Red Hat, Inc.
+ * Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2012-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -228,17 +228,13 @@
                 return new Segment[] { segment };
             }
 
-            var trellis_nbest_map = new HashMap<TrellisNode,NbestNode> (
-                direct_hash,
-                direct_equal);
-
-            var open_list = new PriorityQueue<NbestNode> (
-                (CompareFunc)compare_nbest_node);
-
-            var close_list = new PriorityQueue<NbestNode> (
-                (CompareFunc)compare_nbest_node);
-
-            var duplicates = new HashSet<string> (str_hash, str_equal);
+            var trellis_nbest_map = new HashMap<TrellisNode,NbestNode> ();
+
+            var open_list = new PriorityQueue<NbestNode> (compare_nbest_node);
+
+            var close_list = new PriorityQueue<NbestNode> (compare_nbest_node);
+
+            var duplicates = new Gee.HashSet<string> ();
 
             var eos_nbest_node = new NbestNode (eos_trellis_node);
             trellis_nbest_map.set (eos_trellis_node, eos_nbest_node);
 
=== modified file 'libkkc/bloom-filter.c'
--- libkkc/bloom-filter.c	2014-06-15 23:27:57 +0000
+++ libkkc/bloom-filter.c	2014-10-01 15:12:30 +0000
@@ -1,9 +1,9 @@
-/* bloom-filter.c generated by valac 0.22.1, the Vala compiler
+/* bloom-filter.c generated by valac 0.24.0.131-42e78, the Vala compiler
  * generated from bloom-filter.vala, do not modify */
 
 /*
- * Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2012-2013 Red Hat, Inc.
+ * Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2012-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -160,19 +160,23 @@
 	GMappedFile* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GMappedFile* _tmp2_ = NULL;
+	GMappedFile* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (filename != NULL, NULL);
 	self = (KkcBloomFilter*) g_object_new (object_type, NULL);
 	_tmp1_ = filename;
 	_tmp2_ = g_mapped_file_new (_tmp1_, FALSE, &_inner_error_);
 	_tmp0_ = _tmp2_;
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 		g_propagate_error (error, _inner_error_);
 		_g_object_unref0 (self);
 		return NULL;
 	}
+	_tmp3_ = _tmp0_;
+	_tmp0_ = NULL;
 	_g_mapped_file_unref0 (self->priv->mmap);
-	self->priv->mmap = _tmp0_;
+	self->priv->mmap = _tmp3_;
+	_g_mapped_file_unref0 (_tmp0_);
 	return self;
 }
 
@@ -217,42 +221,40 @@
 			gboolean _tmp0_ = FALSE;
 			_tmp0_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp1_ = FALSE;
-				gint _tmp3_ = 0;
+				gint _tmp2_ = 0;
 				guint32 h = 0U;
+				guint32 _tmp3_ = 0U;
 				guint32 _tmp4_ = 0U;
-				guint32 _tmp5_ = 0U;
-				gint _tmp6_ = 0;
+				gint _tmp5_ = 0;
+				guint32 _tmp6_ = 0U;
+				guint32 i = 0U;
 				guint32 _tmp7_ = 0U;
-				guint32 i = 0U;
-				guint32 _tmp8_ = 0U;
-				GMappedFile* _tmp9_ = NULL;
-				gsize _tmp10_ = 0UL;
-				guint32 _tmp11_ = 0U;
-				gboolean _tmp12_ = FALSE;
-				_tmp1_ = _tmp0_;
-				if (!_tmp1_) {
-					gint _tmp2_ = 0;
-					_tmp2_ = k;
-					k = _tmp2_ + 1;
+				GMappedFile* _tmp8_ = NULL;
+				gsize _tmp9_ = 0UL;
+				guint32 _tmp10_ = 0U;
+				gboolean _tmp11_ = FALSE;
+				if (!_tmp0_) {
+					gint _tmp1_ = 0;
+					_tmp1_ = k;
+					k = _tmp1_ + 1;
 				}
 				_tmp0_ = FALSE;
-				_tmp3_ = k;
-				if (!(_tmp3_ < 4)) {
+				_tmp2_ = k;
+				if (!(_tmp2_ < 4)) {
 					break;
 				}
-				_tmp4_ = b0;
-				_tmp5_ = b1;
-				_tmp6_ = k;
-				_tmp7_ = kkc_murmur_hash3_32 (_tmp4_, _tmp5_, (guint32) _tmp6_);
-				h = _tmp7_;
-				_tmp8_ = h;
-				_tmp9_ = self->priv->mmap;
-				_tmp10_ = g_mapped_file_get_length (_tmp9_);
-				i = (guint32) (_tmp8_ * ((_tmp10_ * 8) / ((gdouble) 0xFFFFFFFFLL)));
-				_tmp11_ = i;
-				_tmp12_ = kkc_bloom_filter_is_bit_set (self, _tmp11_);
-				if (!_tmp12_) {
+				_tmp3_ = b0;
+				_tmp4_ = b1;
+				_tmp5_ = k;
+				_tmp6_ = kkc_murmur_hash3_32 (_tmp3_, _tmp4_, (guint32) _tmp5_);
+				h = _tmp6_;
+				_tmp7_ = h;
+				_tmp8_ = self->priv->mmap;
+				_tmp9_ = g_mapped_file_get_length (_tmp8_);
+				i = (guint32) (_tmp7_ * ((_tmp9_ * 8) / ((gdouble) 0xFFFFFFFFLL)));
+				_tmp10_ = i;
+				_tmp11_ = kkc_bloom_filter_is_bit_set (self, _tmp10_);
+				if (!_tmp11_) {
 					result = FALSE;
 					return result;
 				}
 
=== modified file 'libkkc/bloom-filter.vala'
--- libkkc/bloom-filter.vala	2014-02-26 22:51:39 +0000
+++ libkkc/bloom-filter.vala	2014-10-01 15:12:30 +0000
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2012-2013 Red Hat, Inc.
+ * Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2012-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
=== modified file 'libkkc/candidate-list.c'
--- libkkc/candidate-list.c	2014-06-15 23:27:57 +0000
+++ libkkc/candidate-list.c	2014-10-01 15:12:30 +0000
@@ -1,9 +1,9 @@
-/* candidate-list.c generated by valac 0.22.1, the Vala compiler
+/* candidate-list.c generated by valac 0.24.0.131-42e78, the Vala compiler
  * generated from candidate-list.vala, do not modify */
 
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -134,10 +134,9 @@
 	gint _tmp0_ = 0;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-	gboolean _tmp7_ = FALSE;
-	GeeArrayList* _tmp8_ = NULL;
-	gint _tmp9_ = 0;
-	gpointer _tmp10_ = NULL;
+	GeeArrayList* _tmp7_ = NULL;
+	gint _tmp8_ = 0;
+	gpointer _tmp9_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = index;
 	if (_tmp0_ < 0) {
@@ -157,12 +156,11 @@
 	} else {
 		_tmp2_ = FALSE;
 	}
-	_tmp7_ = _tmp2_;
-	_vala_assert (_tmp7_, "0 <= index && index < size");
-	_tmp8_ = self->priv->_candidates;
-	_tmp9_ = index;
-	_tmp10_ = gee_abstract_list_get ((GeeAbstractList*) _tmp8_, _tmp9_);
-	result = (KkcCandidate*) _tmp10_;
+	_vala_assert (_tmp2_, "0 <= index && index < size");
+	_tmp7_ = self->priv->_candidates;
+	_tmp8_ = index;
+	_tmp9_ = gee_abstract_list_get ((GeeAbstractList*) _tmp7_, _tmp8_);
+	result = (KkcCandidate*) _tmp9_;
 	return result;
 }
 
@@ -337,7 +335,7 @@
 	gint _tmp3__length1 = 0;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = self->priv->_candidates;
-	_tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp0_, &_tmp1_);
+	_tmp2_ = gee_collection_to_array ((GeeCollection*) _tmp0_, &_tmp1_);
 	_tmp3_ = _tmp2_;
 	_tmp3__length1 = _tmp1_;
 	if (result_length1) {
@@ -551,10 +549,9 @@
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
 	g_return_val_if_fail (self != NULL, FALSE);
 	_tmp1_ = self->priv->_candidates;
-	_tmp2_ = gee_abstract_collection_get_is_empty ((GeeAbstractCollection*) _tmp1_);
+	_tmp2_ = gee_collection_get_is_empty ((GeeCollection*) _tmp1_);
 	_tmp3_ = _tmp2_;
 	if (_tmp3_) {
 		_tmp0_ = TRUE;
@@ -563,30 +560,156 @@
 		_tmp4_ = step;
 		_tmp0_ = _tmp4_ == 0;
 	}
-	_tmp5_ = _tmp0_;
-	if (_tmp5_) {
+	if (_tmp0_) {
 		result = FALSE;
 		return result;
 	}
-	_tmp6_ = self->priv->_round;
-	if (_tmp6_) {
+	_tmp5_ = self->priv->_round;
+	if (_tmp5_) {
 		gint pos = 0;
+		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
+		GeeArrayList* _tmp8_ = NULL;
+		gint _tmp9_ = 0;
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
+		gint _tmp16_ = 0;
+		_tmp6_ = self->priv->_cursor_pos;
+		_tmp7_ = step;
+		_tmp8_ = self->priv->_candidates;
+		_tmp9_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp8_);
+		_tmp10_ = _tmp9_;
+		pos = (_tmp6_ + _tmp7_) % _tmp10_;
+		_tmp11_ = pos;
+		if (_tmp11_ < 0) {
+			gint _tmp12_ = 0;
+			GeeArrayList* _tmp13_ = NULL;
+			gint _tmp14_ = 0;
+			gint _tmp15_ = 0;
+			_tmp12_ = pos;
+			_tmp13_ = self->priv->_candidates;
+			_tmp14_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp13_);
+			_tmp15_ = _tmp14_;
+			pos = _tmp12_ + _tmp15_;
+		}
+		_tmp16_ = pos;
+		self->priv->_cursor_pos = _tmp16_;
+		g_object_notify ((GObject*) self, "cursor-pos");
+		result = TRUE;
+		return result;
+	} else {
+		gint pos = 0;
+		gint _tmp17_ = 0;
+		gint _tmp18_ = 0;
+		gboolean _tmp19_ = FALSE;
+		gint _tmp20_ = 0;
+		_tmp17_ = self->priv->_cursor_pos;
+		_tmp18_ = step;
+		pos = _tmp17_ + _tmp18_;
+		_tmp20_ = pos;
+		if (0 <= _tmp20_) {
+			gint _tmp21_ = 0;
+			GeeArrayList* _tmp22_ = NULL;
+			gint _tmp23_ = 0;
+			gint _tmp24_ = 0;
+			_tmp21_ = pos;
+			_tmp22_ = self->priv->_candidates;
+			_tmp23_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp22_);
+			_tmp24_ = _tmp23_;
+			_tmp19_ = _tmp21_ < _tmp24_;
+		} else {
+			_tmp19_ = FALSE;
+		}
+		if (_tmp19_) {
+			gint _tmp25_ = 0;
+			_tmp25_ = pos;
+			self->priv->_cursor_pos = _tmp25_;
+			g_object_notify ((GObject*) self, "cursor-pos");
+			result = TRUE;
+			return result;
+		}
+	}
+	result = FALSE;
+	return result;
+}
+
+
+/**
+         * Move cursor to the previous candidate.
+         *
+         * @return `true` if cursor position has changed, `false` otherwise.
+         */
+gboolean kkc_candidate_list_cursor_up (KkcCandidateList* self) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	g_return_val_if_fail (self != NULL, FALSE);
+	_tmp0_ = kkc_candidate_list_cursor_move (self, -1);
+	result = _tmp0_;
+	return result;
+}
+
+
+/**
+         * Move cursor to the next candidate.
+         *
+         * @return `true` if cursor position has changed, `false` otherwise
+         */
+gboolean kkc_candidate_list_cursor_down (KkcCandidateList* self) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	g_return_val_if_fail (self != NULL, FALSE);
+	_tmp0_ = kkc_candidate_list_cursor_move (self, 1);
+	result = _tmp0_;
+	return result;
+}
+
+
+static gboolean kkc_candidate_list_page_move (KkcCandidateList* self, gint step) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	GeeArrayList* _tmp1_ = NULL;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp5_ = FALSE;
+	g_return_val_if_fail (self != NULL, FALSE);
+	_tmp1_ = self->priv->_candidates;
+	_tmp2_ = gee_collection_get_is_empty ((GeeCollection*) _tmp1_);
+	_tmp3_ = _tmp2_;
+	if (_tmp3_) {
+		_tmp0_ = TRUE;
+	} else {
+		gint _tmp4_ = 0;
+		_tmp4_ = step;
+		_tmp0_ = _tmp4_ == 0;
+	}
+	if (_tmp0_) {
+		result = FALSE;
+		return result;
+	}
+	_tmp5_ = self->priv->_round;
+	if (_tmp5_) {
+		guint pos = 0U;
+		gint _tmp6_ = 0;
+		guint _tmp7_ = 0U;
 		gint _tmp8_ = 0;
 		GeeArrayList* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		gint _tmp17_ = 0;
-		_tmp7_ = self->priv->_cursor_pos;
+		guint _tmp12_ = 0U;
+		guint _tmp17_ = 0U;
+		guint _tmp18_ = 0U;
+		guint _tmp19_ = 0U;
+		gint _tmp20_ = 0;
+		_tmp6_ = self->priv->_cursor_pos;
+		_tmp7_ = self->priv->_page_size;
 		_tmp8_ = step;
 		_tmp9_ = self->priv->_candidates;
 		_tmp10_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp9_);
 		_tmp11_ = _tmp10_;
-		pos = (_tmp7_ + _tmp8_) % _tmp11_;
+		pos = (_tmp6_ + (_tmp7_ * _tmp8_)) % _tmp11_;
 		_tmp12_ = pos;
-		if (_tmp12_ < 0) {
-			gint _tmp13_ = 0;
+		if (_tmp12_ < ((guint) 0)) {
+			guint _tmp13_ = 0U;
 			GeeArrayList* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
@@ -597,190 +720,57 @@
 			pos = _tmp13_ + _tmp16_;
 		}
 		_tmp17_ = pos;
-		self->priv->_cursor_pos = _tmp17_;
-		g_object_notify ((GObject*) self, "cursor-pos");
-		result = TRUE;
-		return result;
+		_tmp18_ = kkc_candidate_list_get_page_start_cursor_pos (self, _tmp17_);
+		pos = _tmp18_;
+		_tmp19_ = pos;
+		_tmp20_ = self->priv->_cursor_pos;
+		if (_tmp19_ != ((guint) _tmp20_)) {
+			guint _tmp21_ = 0U;
+			_tmp21_ = pos;
+			self->priv->_cursor_pos = (gint) _tmp21_;
+			g_object_notify ((GObject*) self, "cursor-pos");
+			result = TRUE;
+			return result;
+		}
 	} else {
-		gint pos = 0;
-		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		gboolean _tmp20_ = FALSE;
-		gint _tmp21_ = 0;
-		gboolean _tmp26_ = FALSE;
-		_tmp18_ = self->priv->_cursor_pos;
-		_tmp19_ = step;
-		pos = _tmp18_ + _tmp19_;
-		_tmp21_ = pos;
-		if (0 <= _tmp21_) {
-			gint _tmp22_ = 0;
-			GeeArrayList* _tmp23_ = NULL;
-			gint _tmp24_ = 0;
-			gint _tmp25_ = 0;
-			_tmp22_ = pos;
-			_tmp23_ = self->priv->_candidates;
-			_tmp24_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp23_);
-			_tmp25_ = _tmp24_;
-			_tmp20_ = _tmp22_ < _tmp25_;
-		} else {
-			_tmp20_ = FALSE;
-		}
-		_tmp26_ = _tmp20_;
-		if (_tmp26_) {
-			gint _tmp27_ = 0;
+		guint pos = 0U;
+		gint _tmp22_ = 0;
+		guint _tmp23_ = 0U;
+		gint _tmp24_ = 0;
+		gboolean _tmp25_ = FALSE;
+		guint _tmp26_ = 0U;
+		_tmp22_ = self->priv->_cursor_pos;
+		_tmp23_ = self->priv->_page_size;
+		_tmp24_ = step;
+		pos = _tmp22_ + (_tmp23_ * _tmp24_);
+		_tmp26_ = pos;
+		if (((guint) 0) <= _tmp26_) {
+			guint _tmp27_ = 0U;
+			GeeArrayList* _tmp28_ = NULL;
+			gint _tmp29_ = 0;
+			gint _tmp30_ = 0;
 			_tmp27_ = pos;
-			self->priv->_cursor_pos = _tmp27_;
-			g_object_notify ((GObject*) self, "cursor-pos");
-			result = TRUE;
-			return result;
-		}
-	}
-	result = FALSE;
-	return result;
-}
-
-
-/**
-         * Move cursor to the previous candidate.
-         *
-         * @return `true` if cursor position has changed, `false` otherwise.
-         */
-gboolean kkc_candidate_list_cursor_up (KkcCandidateList* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	g_return_val_if_fail (self != NULL, FALSE);
-	_tmp0_ = kkc_candidate_list_cursor_move (self, -1);
-	result = _tmp0_;
-	return result;
-}
-
-
-/**
-         * Move cursor to the next candidate.
-         *
-         * @return `true` if cursor position has changed, `false` otherwise
-         */
-gboolean kkc_candidate_list_cursor_down (KkcCandidateList* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	g_return_val_if_fail (self != NULL, FALSE);
-	_tmp0_ = kkc_candidate_list_cursor_move (self, 1);
-	result = _tmp0_;
-	return result;
-}
-
-
-static gboolean kkc_candidate_list_page_move (KkcCandidateList* self, gint step) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	GeeArrayList* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	g_return_val_if_fail (self != NULL, FALSE);
-	_tmp1_ = self->priv->_candidates;
-	_tmp2_ = gee_abstract_collection_get_is_empty ((GeeAbstractCollection*) _tmp1_);
-	_tmp3_ = _tmp2_;
-	if (_tmp3_) {
-		_tmp0_ = TRUE;
-	} else {
-		gint _tmp4_ = 0;
-		_tmp4_ = step;
-		_tmp0_ = _tmp4_ == 0;
-	}
-	_tmp5_ = _tmp0_;
-	if (_tmp5_) {
-		result = FALSE;
-		return result;
-	}
-	_tmp6_ = self->priv->_round;
-	if (_tmp6_) {
-		guint pos = 0U;
-		gint _tmp7_ = 0;
-		guint _tmp8_ = 0U;
-		gint _tmp9_ = 0;
-		GeeArrayList* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
-		guint _tmp13_ = 0U;
-		guint _tmp18_ = 0U;
-		guint _tmp19_ = 0U;
-		guint _tmp20_ = 0U;
-		gint _tmp21_ = 0;
-		_tmp7_ = self->priv->_cursor_pos;
-		_tmp8_ = self->priv->_page_size;
-		_tmp9_ = step;
-		_tmp10_ = self->priv->_candidates;
-		_tmp11_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp10_);
-		_tmp12_ = _tmp11_;
-		pos = (_tmp7_ + (_tmp8_ * _tmp9_)) % _tmp12_;
-		_tmp13_ = pos;
-		if (_tmp13_ < ((guint) 0)) {
-			guint _tmp14_ = 0U;
-			GeeArrayList* _tmp15_ = NULL;
-			gint _tmp16_ = 0;
-			gint _tmp17_ = 0;
-			_tmp14_ = pos;
-			_tmp15_ = self->priv->_candidates;
-			_tmp16_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp15_);
-			_tmp17_ = _tmp16_;
-			pos = _tmp14_ + _tmp17_;
-		}
-		_tmp18_ = pos;
-		_tmp19_ = kkc_candidate_list_get_page_start_cursor_pos (self, _tmp18_);
-		pos = _tmp19_;
-		_tmp20_ = pos;
-		_tmp21_ = self->priv->_cursor_pos;
-		if (_tmp20_ != ((guint) _tmp21_)) {
-			guint _tmp22_ = 0U;
-			_tmp22_ = pos;
-			self->priv->_cursor_pos = (gint) _tmp22_;
-			g_object_notify ((GObject*) self, "cursor-pos");
-			result = TRUE;
-			return result;
-		}
-	} else {
-		guint pos = 0U;
-		gint _tmp23_ = 0;
-		guint _tmp24_ = 0U;
-		gint _tmp25_ = 0;
-		gboolean _tmp26_ = FALSE;
-		guint _tmp27_ = 0U;
-		gboolean _tmp32_ = FALSE;
-		_tmp23_ = self->priv->_cursor_pos;
-		_tmp24_ = self->priv->_page_size;
-		_tmp25_ = step;
-		pos = _tmp23_ + (_tmp24_ * _tmp25_);
-		_tmp27_ = pos;
-		if (((guint) 0) <= _tmp27_) {
-			guint _tmp28_ = 0U;
-			GeeArrayList* _tmp29_ = NULL;
-			gint _tmp30_ = 0;
-			gint _tmp31_ = 0;
-			_tmp28_ = pos;
-			_tmp29_ = self->priv->_candidates;
-			_tmp30_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp29_);
-			_tmp31_ = _tmp30_;
-			_tmp26_ = _tmp28_ < ((guint) _tmp31_);
+			_tmp28_ = self->priv->_candidates;
+			_tmp29_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp28_);
+			_tmp30_ = _tmp29_;
+			_tmp25_ = _tmp27_ < ((guint) _tmp30_);
 		} else {
-			_tmp26_ = FALSE;
+			_tmp25_ = FALSE;
 		}
-		_tmp32_ = _tmp26_;
-		if (_tmp32_) {
+		if (_tmp25_) {
+			guint _tmp31_ = 0U;
+			guint _tmp32_ = 0U;
 			guint _tmp33_ = 0U;
-			guint _tmp34_ = 0U;
-			guint _tmp35_ = 0U;
-			gint _tmp36_ = 0;
+			gint _tmp34_ = 0;
+			_tmp31_ = pos;
+			_tmp32_ = kkc_candidate_list_get_page_start_cursor_pos (self, _tmp31_);
+			pos = _tmp32_;
 			_tmp33_ = pos;
-			_tmp34_ = kkc_candidate_list_get_page_start_cursor_pos (self, _tmp33_);
-			pos = _tmp34_;
-			_tmp35_ = pos;
-			_tmp36_ = self->priv->_cursor_pos;
-			if (_tmp35_ != ((guint) _tmp36_)) {
-				guint _tmp37_ = 0U;
-				_tmp37_ = pos;
-				self->priv->_cursor_pos = (gint) _tmp37_;
+			_tmp34_ = self->priv->_cursor_pos;
+			if (_tmp33_ != ((guint) _tmp34_)) {
+				guint _tmp35_ = 0U;
+				_tmp35_ = pos;
+				self->priv->_cursor_pos = (gint) _tmp35_;
 				g_object_notify ((GObject*) self, "cursor-pos");
 				result = TRUE;
 				return result;
@@ -927,8 +917,8 @@
 static void kkc_candidate_list_class_init (KkcCandidateListClass * klass) {
 	kkc_candidate_list_parent_class = g_type_class_peek_parent (klass);
 	g_type_class_add_private (klass, sizeof (KkcCandidateListPrivate));
-	KKC_CANDIDATE_LIST_CLASS (klass)->next = kkc_candidate_list_real_next;
-	KKC_CANDIDATE_LIST_CLASS (klass)->previous = kkc_candidate_list_real_previous;
+	((KkcCandidateListClass *) klass)->next = kkc_candidate_list_real_next;
+	((KkcCandidateListClass *) klass)->previous = kkc_candidate_list_real_previous;
 	G_OBJECT_CLASS (klass)->get_property = _vala_kkc_candidate_list_get_property;
 	G_OBJECT_CLASS (klass)->set_property = _vala_kkc_candidate_list_set_property;
 	G_OBJECT_CLASS (klass)->finalize = kkc_candidate_list_finalize;
@@ -973,9 +963,9 @@
 	GeeArrayList* _tmp0_ = NULL;
 	GeeHashSet* _tmp1_ = NULL;
 	self->priv = KKC_CANDIDATE_LIST_GET_PRIVATE (self);
-	_tmp0_ = gee_array_list_new (KKC_TYPE_CANDIDATE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL);
+	_tmp0_ = gee_array_list_new (KKC_TYPE_CANDIDATE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 	self->priv->_candidates = _tmp0_;
-	_tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL);
+	_tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
 	self->priv->seen = (GeeSet*) _tmp1_;
 }
 
 
=== modified file 'libkkc/candidate-list.vala'
--- libkkc/candidate-list.vala	2014-02-26 22:51:39 +0000
+++ libkkc/candidate-list.vala	2014-10-01 15:12:30 +0000
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
             }
         }
 
-        Set<string> seen = new HashSet<string> ();
+        Set<string> seen = new Gee.HashSet<string> ();
 
         internal void clear () {
             bool is_populated = false;
 
=== modified file 'libkkc/candidate.c'
--- libkkc/candidate.c	2014-06-15 23:27:57 +0000
+++ libkkc/candidate.c	2014-10-01 15:12:30 +0000
@@ -1,9 +1,9 @@
-/* candidate.c generated by valac 0.22.1, the Vala compiler
+/* candidate.c generated by valac 0.24.0.131-42e78, the Vala compiler
  * generated from candidate.vala, do not modify */
 
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -140,7 +140,6 @@
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp8_ = NULL;
 	g_return_val_if_fail (midasi != NULL, NULL);
 	g_return_val_if_fail (text != NULL, NULL);
 	self = (KkcCandidate*) g_object_new (object_type, NULL);
@@ -162,8 +161,7 @@
 		_tmp7_ = output;
 		_tmp4_ = _tmp7_;
 	}
-	_tmp8_ = _tmp4_;
-	kkc_candidate_set_output (self, _tmp8_);
+	kkc_candidate_set_output (self, _tmp4_);
 	return self;
 }
 
 
=== modified file 'libkkc/candidate.vala'
--- libkkc/candidate.vala	2014-02-26 22:51:39 +0000
+++ libkkc/candidate.vala	2014-10-01 15:12:30 +0000
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
=== modified file 'libkkc/context.c'
--- libkkc/context.c	2014-06-15 23:27:57 +0000
+++ libkkc/context.c	2014-10-01 15:12:30 +0000
@@ -1,9 +1,9 @@
-/* context.c generated by valac 0.22.1, the Vala compiler
+/* context.c generated by valac 0.24.0.131-42e78, the Vala compiler
  * generated from context.vala, do not modify */
 
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -472,17 +472,17 @@
 
 
 static void _kkc_context_notify_input_mode_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) {
-	kkc_context_notify_input_mode_cb (self, _sender, pspec);
+	kkc_context_notify_input_mode_cb ((KkcContext*) self, _sender, pspec);
 }
 
 
 static void _kkc_context_request_selection_text_cb_kkc_state_request_selection_text (KkcState* _sender, gpointer self) {
-	kkc_context_request_selection_text_cb (self);
+	kkc_context_request_selection_text_cb ((KkcContext*) self);
 }
 
 
 static void _kkc_context_candidates_selected_cb_kkc_candidate_list_selected (KkcCandidateList* _sender, KkcCandidate* candidate, gpointer self) {
-	kkc_context_candidates_selected_cb (self);
+	kkc_context_candidates_selected_cb ((KkcContext*) self);
 }
 
 
@@ -620,7 +620,7 @@
 	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_return_val_if_fail (keyseq != NULL, FALSE);
-	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL);
+	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
 	keys = (GeeList*) _tmp0_;
 	_tmp1_ = g_string_new ("");
 	builder = _tmp1_;
@@ -827,7 +827,6 @@
 			gboolean _tmp60_ = FALSE;
 			KkcKeyEvent* _tmp61_ = NULL;
 			gboolean _tmp62_ = FALSE;
-			gboolean _tmp64_ = FALSE;
 			_tmp44_ = _key_index;
 			_key_index = _tmp44_ + 1;
 			_tmp45_ = _key_index;
@@ -876,7 +875,7 @@
 			_tmp58_ = key;
 			_tmp59_ = kkc_key_event_new_from_string (_tmp58_, &_inner_error_);
 			ev = _tmp59_;
-			if (_inner_error_ != NULL) {
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
 				if (_inner_error_->domain == KKC_KEY_EVENT_FORMAT_ERROR) {
 					g_propagate_error (error, _inner_error_);
 					_g_free0 (key);
@@ -903,8 +902,7 @@
 			} else {
 				_tmp60_ = FALSE;
 			}
-			_tmp64_ = _tmp60_;
-			if (_tmp64_) {
+			if (_tmp60_) {
 				retval = TRUE;
 			}
 			_g_object_unref0 (ev);
@@ -1320,7 +1318,7 @@
 
 
 static void _kkc_context_filter_forwarded_cb_kkc_key_event_filter_forwarded (KkcKeyEventFilter* _sender, KkcKeyEvent* key, gpointer self) {
-	kkc_context_filter_forwarded_cb (self, key);
+	kkc_context_filter_forwarded_cb ((KkcContext*) self, key);
 }
 
 
@@ -1439,7 +1437,7 @@
 static void kkc_context_instance_init (KkcContext * self) {
 	GeeHashMap* _tmp0_ = NULL;
 	self->priv = KKC_CONTEXT_GET_PRIVATE (self);
-	_tmp0_ = gee_hash_map_new (G_TYPE_GTYPE, NULL, NULL, KKC_TYPE_STATE_HANDLER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+	_tmp0_ = gee_hash_map_new (G_TYPE_GTYPE, NULL, NULL, KKC_TYPE_STATE_HANDLER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 	self->priv->handlers = (GeeMap*) _tmp0_;
 }
 
 
=== modified file 'libkkc/context.vala'
--- libkkc/context.vala	2014-02-26 22:51:39 +0000
+++ libkkc/context.vala	2014-10-01 15:12:30 +0000
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
=== modified file 'libkkc/convert-segment-state-handler.c'
--- libkkc/convert-segment-state-handler.c	2014-06-15 23:27:57 +0000
+++ libkkc/convert-segment-state-handler.c	2014-10-01 15:12:30 +0000
@@ -1,9 +1,9 @@
-/* convert-segment-state-handler.c generated by valac 0.22.1, the Vala compiler
+/* convert-segment-state-handler.c generated by valac 0.24.0.131-42e78, the Vala compiler
  * generated from convert-segment-state-handler.vala, do not modify */
 
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -409,35 +409,35 @@
 
 static gboolean _kkc_convert_segment_state_handler_do_next_candidate_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_segment_state_handler_do_next_candidate (self, command, state, key);
+	result = kkc_convert_segment_state_handler_do_next_candidate ((KkcConvertSegmentStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_segment_state_handler_do_previous_candidate_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_segment_state_handler_do_previous_candidate (self, command, state, key);
+	result = kkc_convert_segment_state_handler_do_previous_candidate ((KkcConvertSegmentStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_segment_state_handler_do_purge_candidate_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_segment_state_handler_do_purge_candidate (self, command, state, key);
+	result = kkc_convert_segment_state_handler_do_purge_candidate ((KkcConvertSegmentStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_segment_state_handler_do_clear_unhandled_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_segment_state_handler_do_clear_unhandled (self, command, state, key);
+	result = kkc_convert_segment_state_handler_do_clear_unhandled ((KkcConvertSegmentStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_segment_state_handler_do_select_unhandled_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_segment_state_handler_do_select_unhandled (self, command, state, key);
+	result = kkc_convert_segment_state_handler_do_select_unhandled ((KkcConvertSegmentStateHandler*) self, command, state, key);
 	return result;
 }
 
@@ -487,46 +487,44 @@
 			gboolean _tmp3_ = FALSE;
 			_tmp3_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp4_ = FALSE;
-				gint _tmp6_ = 0;
-				GEnumClass* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
+				gint _tmp5_ = 0;
+				GEnumClass* _tmp6_ = NULL;
+				gint _tmp7_ = 0;
 				GEnumValue* enum_value = NULL;
-				GEnumClass* _tmp9_ = NULL;
-				gint _tmp10_ = 0;
+				GEnumClass* _tmp8_ = NULL;
+				gint _tmp9_ = 0;
+				GEnumValue* _tmp10_ = NULL;
 				GEnumValue* _tmp11_ = NULL;
 				GEnumValue* _tmp12_ = NULL;
-				GEnumValue* _tmp13_ = NULL;
-				_tmp4_ = _tmp3_;
-				if (!_tmp4_) {
-					gint _tmp5_ = 0;
-					_tmp5_ = i;
-					i = _tmp5_ + 1;
+				if (!_tmp3_) {
+					gint _tmp4_ = 0;
+					_tmp4_ = i;
+					i = _tmp4_ + 1;
 				}
 				_tmp3_ = FALSE;
-				_tmp6_ = i;
-				_tmp7_ = enum_class;
-				_tmp8_ = _tmp7_->maximum;
-				if (!(_tmp6_ <= _tmp8_)) {
+				_tmp5_ = i;
+				_tmp6_ = enum_class;
+				_tmp7_ = _tmp6_->maximum;
+				if (!(_tmp5_ <= _tmp7_)) {
 					break;
 				}
-				_tmp9_ = enum_class;
-				_tmp10_ = i;
-				_tmp11_ = g_enum_get_value (_tmp9_, _tmp10_);
-				_tmp12_ = __g_enum_value_dup0 (_tmp11_);
-				enum_value = _tmp12_;
-				_tmp13_ = enum_value;
-				if (_tmp13_ != NULL) {
-					GEnumValue* _tmp14_ = NULL;
-					const gchar* _tmp15_ = NULL;
+				_tmp8_ = enum_class;
+				_tmp9_ = i;
+				_tmp10_ = g_enum_get_value (_tmp8_, _tmp9_);
+				_tmp11_ = __g_enum_value_dup0 (_tmp10_);
+				enum_value = _tmp11_;
+				_tmp12_ = enum_value;
+				if (_tmp12_ != NULL) {
+					GEnumValue* _tmp13_ = NULL;
+					const gchar* _tmp14_ = NULL;
+					gchar* _tmp15_ = NULL;
 					gchar* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
-					_tmp14_ = enum_value;
-					_tmp15_ = (*_tmp14_).value_nick;
-					_tmp16_ = g_strconcat ("convert-", _tmp15_, NULL);
-					_tmp17_ = _tmp16_;
-					kkc_state_handler_register_command_callback ((KkcStateHandler*) self, _tmp17_, _kkc_convert_segment_state_handler_do_clear_unhandled_kkc_command_callback, self);
-					_g_free0 (_tmp17_);
+					_tmp13_ = enum_value;
+					_tmp14_ = (*_tmp13_).value_nick;
+					_tmp15_ = g_strconcat ("convert-", _tmp14_, NULL);
+					_tmp16_ = _tmp15_;
+					kkc_state_handler_register_command_callback ((KkcStateHandler*) self, _tmp16_, _kkc_convert_segment_state_handler_do_clear_unhandled_kkc_command_callback, self);
+					_g_free0 (_tmp16_);
 				}
 				_g_free0 (enum_value);
 			}
@@ -540,7 +538,7 @@
 
 static void kkc_convert_segment_state_handler_class_init (KkcConvertSegmentStateHandlerClass * klass) {
 	kkc_convert_segment_state_handler_parent_class = g_type_class_peek_parent (klass);
-	KKC_STATE_HANDLER_CLASS (klass)->process_key_event = kkc_convert_segment_state_handler_real_process_key_event;
+	((KkcStateHandlerClass *) klass)->process_key_event = kkc_convert_segment_state_handler_real_process_key_event;
 	G_OBJECT_CLASS (klass)->constructor = kkc_convert_segment_state_handler_constructor;
 }
 
 
=== modified file 'libkkc/convert-segment-state-handler.vala'
--- libkkc/convert-segment-state-handler.vala	2014-06-15 23:27:57 +0000
+++ libkkc/convert-segment-state-handler.vala	2014-10-01 15:12:30 +0000
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
=== modified file 'libkkc/convert-sentence-state-handler.c'
--- libkkc/convert-sentence-state-handler.c	2014-06-15 23:27:57 +0000
+++ libkkc/convert-sentence-state-handler.c	2014-10-01 15:12:30 +0000
@@ -1,9 +1,9 @@
-/* convert-sentence-state-handler.c generated by valac 0.22.1, the Vala compiler
+/* convert-sentence-state-handler.c generated by valac 0.24.0.131-42e78, the Vala compiler
  * generated from convert-sentence-state-handler.vala, do not modify */
 
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -599,10 +599,8 @@
 	KkcState* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
 	const gchar* _tmp9_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_ = NULL;
-	gboolean _tmp27_ = FALSE;
+	gboolean _tmp15_ = FALSE;
+	const gchar* _tmp16_ = NULL;
 	g_return_val_if_fail (self != NULL, FALSE);
 	g_return_val_if_fail (state != NULL, FALSE);
 	g_return_val_if_fail (key != NULL, FALSE);
@@ -624,7 +622,6 @@
 	} else {
 		gboolean _tmp10_ = FALSE;
 		const gchar* _tmp11_ = NULL;
-		gboolean _tmp15_ = FALSE;
 		_tmp11_ = command;
 		if (_tmp11_ == NULL) {
 			KkcKeyEvent* _tmp12_ = NULL;
@@ -637,42 +634,37 @@
 		} else {
 			_tmp10_ = FALSE;
 		}
-		_tmp15_ = _tmp10_;
-		_tmp8_ = _tmp15_;
+		_tmp8_ = _tmp10_;
 	}
-	_tmp16_ = _tmp8_;
-	if (_tmp16_) {
+	if (_tmp8_) {
 		result = TRUE;
 		return result;
 	}
-	_tmp18_ = command;
-	if (_tmp18_ == NULL) {
-		gboolean _tmp19_ = FALSE;
-		KkcKeyEvent* _tmp20_ = NULL;
-		KkcModifierType _tmp21_ = 0;
-		KkcModifierType _tmp22_ = 0;
-		gboolean _tmp26_ = FALSE;
-		_tmp20_ = key;
-		_tmp21_ = kkc_key_event_get_modifiers (_tmp20_);
-		_tmp22_ = _tmp21_;
-		if (_tmp22_ == 0) {
-			_tmp19_ = TRUE;
+	_tmp16_ = command;
+	if (_tmp16_ == NULL) {
+		gboolean _tmp17_ = FALSE;
+		KkcKeyEvent* _tmp18_ = NULL;
+		KkcModifierType _tmp19_ = 0;
+		KkcModifierType _tmp20_ = 0;
+		_tmp18_ = key;
+		_tmp19_ = kkc_key_event_get_modifiers (_tmp18_);
+		_tmp20_ = _tmp19_;
+		if (_tmp20_ == 0) {
+			_tmp17_ = TRUE;
 		} else {
-			KkcKeyEvent* _tmp23_ = NULL;
-			KkcModifierType _tmp24_ = 0;
-			KkcModifierType _tmp25_ = 0;
-			_tmp23_ = key;
-			_tmp24_ = kkc_key_event_get_modifiers (_tmp23_);
-			_tmp25_ = _tmp24_;
-			_tmp19_ = _tmp25_ == KKC_MODIFIER_TYPE_SHIFT_MASK;
+			KkcKeyEvent* _tmp21_ = NULL;
+			KkcModifierType _tmp22_ = 0;
+			KkcModifierType _tmp23_ = 0;
+			_tmp21_ = key;
+			_tmp22_ = kkc_key_event_get_modifiers (_tmp21_);
+			_tmp23_ = _tmp22_;
+			_tmp17_ = _tmp23_ == KKC_MODIFIER_TYPE_SHIFT_MASK;
 		}
-		_tmp26_ = _tmp19_;
-		_tmp17_ = _tmp26_;
+		_tmp15_ = _tmp17_;
 	} else {
-		_tmp17_ = FALSE;
+		_tmp15_ = FALSE;
 	}
-	_tmp27_ = _tmp17_;
-	if (_tmp27_) {
+	if (_tmp15_) {
 		result = FALSE;
 		return result;
 	}
@@ -712,63 +704,63 @@
 
 static gboolean _kkc_convert_sentence_state_handler_do_start_segment_conversion_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_sentence_state_handler_do_start_segment_conversion (self, command, state, key);
+	result = kkc_convert_sentence_state_handler_do_start_segment_conversion ((KkcConvertSentenceStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_sentence_state_handler_do_original_candidate_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_sentence_state_handler_do_original_candidate (self, command, state, key);
+	result = kkc_convert_sentence_state_handler_do_original_candidate ((KkcConvertSentenceStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_sentence_state_handler_do_expand_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_sentence_state_handler_do_expand_segment (self, command, state, key);
+	result = kkc_convert_sentence_state_handler_do_expand_segment ((KkcConvertSentenceStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_sentence_state_handler_do_shrink_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_sentence_state_handler_do_shrink_segment (self, command, state, key);
+	result = kkc_convert_sentence_state_handler_do_shrink_segment ((KkcConvertSentenceStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_sentence_state_handler_do_next_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_sentence_state_handler_do_next_segment (self, command, state, key);
+	result = kkc_convert_sentence_state_handler_do_next_segment ((KkcConvertSentenceStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_sentence_state_handler_do_previous_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_sentence_state_handler_do_previous_segment (self, command, state, key);
+	result = kkc_convert_sentence_state_handler_do_previous_segment ((KkcConvertSentenceStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_sentence_state_handler_do_first_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_sentence_state_handler_do_first_segment (self, command, state, key);
+	result = kkc_convert_sentence_state_handler_do_first_segment ((KkcConvertSentenceStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_sentence_state_handler_do_last_segment_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_sentence_state_handler_do_last_segment (self, command, state, key);
+	result = kkc_convert_sentence_state_handler_do_last_segment ((KkcConvertSentenceStateHandler*) self, command, state, key);
 	return result;
 }
 
 
 static gboolean _kkc_convert_sentence_state_handler_do_clear_unhandled_kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_sentence_state_handler_do_clear_unhandled (self, command, state, key);
+	result = kkc_convert_sentence_state_handler_do_clear_unhandled ((KkcConvertSentenceStateHandler*) self, command, state, key);
 	return result;
 }
 
@@ -788,7 +780,7 @@
 
 static gboolean _kkc_convert_sentence_state_handler_do__kkc_command_callback (const gchar* command, KkcState* state, KkcKeyEvent* key, gpointer self) {
 	gboolean result;
-	result = kkc_convert_sentence_state_handler_do_ (self, command, state, key);
+	result = kkc_convert_sentence_state_handler_do_ ((KkcConvertSentenceStateHandler*) self, command, state, key);
 	return result;
 }
 
@@ -827,55 +819,53 @@
 			gboolean _tmp3_ = FALSE;
 			_tmp3_ = TRUE;
 			while (TRUE) {
-				gboolean _tmp4_ = FALSE;
-				gint _tmp6_ = 0;
-				GEnumClass* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
+				gint _tmp5_ = 0;
+				GEnumClass* _tmp6_ = NULL;
+				gint _tmp7_ = 0;
 				GEnumValue* enum_value = NULL;
-				GEnumClass* _tmp9_ = NULL;
-				gint _tmp10_ = 0;
+				GEnumClass* _tmp8_ = NULL;
+				gint _tmp9_ = 0;
+				GEnumValue* _tmp10_ = NULL;
 				GEnumValue* _tmp11_ = NULL;
 				GEnumValue* _tmp12_ = NULL;
-				GEnumValue* _tmp13_ = NULL;
-				_tmp4_ = _tmp3_;
-				if (!_tmp4_) {
-					gint _tmp5_ = 0;
-					_tmp5_ = i;
-					i = _tmp5_ + 1;
+				if (!_tmp3_) {
+					gint _tmp4_ = 0;
+					_tmp4_ = i;
+					i = _tmp4_ + 1;
 				}
 				_tmp3_ = FALSE;
-				_tmp6_ = i;
-				_tmp7_ = enum_class;
-				_tmp8_ = _tmp7_->maximum;
-				if (!(_tmp6_ <= _tmp8_)) {
+				_tmp5_ = i;
+				_tmp6_ = enum_class;
+				_tmp7_ = _tmp6_->maximum;
+				if (!(_tmp5_ <= _tmp7_)) {
 					break;
 				}
-				_tmp9_ = enum_class;
-				_tmp10_ = i;
-				_tmp11_ = g_enum_get_value (_tmp9_, _tmp10_);
-				_tmp12_ = __g_enum_value_dup0 (_tmp11_);
-				enum_value = _tmp12_;
-				_tmp13_ = enum_value;
-				if (_tmp13_ != NULL) {
-					GEnumValue* _tmp14_ = NULL;
-					const gchar* _tmp15_ = NULL;
+				_tmp8_ = enum_class;
+				_tmp9_ = i;
+				_tmp10_ = g_enum_get_value (_tmp8_, _tmp9_);
+				_tmp11_ = __g_enum_value_dup0 (_tmp10_);
+				enum_value = _tmp11_;
+				_tmp12_ = enum_value;
+				if (_tmp12_ != NULL) {
+					GEnumValue* _tmp13_ = NULL;
+					const gchar* _tmp14_ = NULL;
+					gchar* _tmp15_ = NULL;
 					gchar* _tmp16_ = NULL;
-					gchar* _tmp17_ = NULL;
-					GEnumValue* _tmp18_ = NULL;
-					gint _tmp19_ = 0;
+					GEnumValue* _tmp17_ = NULL;
+					gint _tmp18_ = 0;
+					KkcConvertSentenceStateHandlerConvertCommandHandler* _tmp19_ = NULL;
 					KkcConvertSentenceStateHandlerConvertCommandHandler* _tmp20_ = NULL;
-					KkcConvertSentenceStateHandlerConvertCommandHandler* _tmp21_ = NULL;
-					_tmp14_ = enum_value;
-					_tmp15_ = (*_tmp14_).value_nick;
-					_tmp16_ = g_strconcat ("convert-", _tmp15_, NULL);
-					_tmp17_ = _tmp16_;
-					_tmp18_ = enum_value;
-					_tmp19_ = (*_tmp18_).value;
-					_tmp20_ = kkc_convert_sentence_state_handler_convert_command_handler_new ((KkcKanaMode) _tmp19_);
-					_tmp21_ = _tmp20_;
-					kkc_state_handler_register_command_handler ((KkcStateHandler*) self, _tmp17_, (KkcCommandHandler*) _tmp21_);
-					_g_object_unref0 (_tmp21_);
-					_g_free0 (_tmp17_);
+					_tmp13_ = enum_value;
+					_tmp14_ = (*_tmp13_).value_nick;
+					_tmp15_ = g_strconcat ("convert-", _tmp14_, NULL);
+					_tmp16_ = _tmp15_;
+					_tmp17_ = enum_value;
+					_tmp18_ = (*_tmp17_).value;
+					_tmp19_ = kkc_convert_sentence_state_handler_convert_command_handler_new ((KkcKanaMode) _tmp18_);
+					_tmp20_ = _tmp19_;
+					kkc_state_handler_register_command_handler ((KkcStateHandler*) self, _tmp16_, (KkcCommandHandler*) _tmp20_);
+					_g_object_unref0 (_tmp20_);
+					_g_free0 (_tmp16_);
 				}
 				_g_free0 (enum_value);
 			}
@@ -959,7 +949,7 @@
 
 static void kkc_convert_sentence_state_handler_class_init (KkcConvertSentenceStateHandlerClass * klass) {
 	kkc_convert_sentence_state_handler_parent_class = g_type_class_peek_parent (klass);
-	KKC_STATE_HANDLER_CLASS (klass)->process_key_event = kkc_convert_sentence_state_handler_real_process_key_event;
+	((KkcStateHandlerClass *) klass)->process_key_event = kkc_convert_sentence_state_handler_real_process_key_event;
 	G_OBJECT_CLASS (klass)->constructor = kkc_convert_sentence_state_handler_constructor;
 }
 
 
=== modified file 'libkkc/convert-sentence-state-handler.vala'
--- libkkc/convert-sentence-state-handler.vala	2014-06-15 23:27:57 +0000
+++ libkkc/convert-sentence-state-handler.vala	2014-10-01 15:12:30 +0000
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
=== modified file 'libkkc/decoder.c'
--- libkkc/decoder.c	2014-06-15 23:27:57 +0000
+++ libkkc/decoder.c	2014-10-01 15:12:30 +0000
@@ -1,9 +1,9 @@
-/* decoder.c generated by valac 0.22.1, the Vala compiler
+/* decoder.c generated by valac 0.24.0.131-42e78, the Vala compiler
  * generated from decoder.vala, do not modify */
 
 /*
- * Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2012-2013 Red Hat, Inc.
+ * Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2012-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -234,8 +234,8 @@
 
 static void kkc_decoder_class_init (KkcDecoderClass * klass) {
 	kkc_decoder_parent_class = g_type_class_peek_parent (klass);
-	KKC_DECODER_CLASS (klass)->decode = kkc_decoder_real_decode;
-	KKC_DECODER_CLASS (klass)->decode_with_costs = kkc_decoder_real_decode_with_costs;
+	((KkcDecoderClass *) klass)->decode = kkc_decoder_real_decode;
+	((KkcDecoderClass *) klass)->decode_with_costs = kkc_decoder_real_decode_with_costs;
 }
 
 
 
=== modified file 'libkkc/decoder.vala'
--- libkkc/decoder.vala	2014-02-26 22:51:39 +0000
+++ libkkc/decoder.vala	2014-10-01 15:12:30 +0000
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2012-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2012-2013 Red Hat, Inc.
+ * Copyright (C) 2012-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2012-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
=== modified file 'libkkc/dictionary-list.c'
--- libkkc/dictionary-list.c	2014-06-15 23:27:57 +0000
+++ libkkc/dictionary-list.c	2014-10-01 15:12:30 +0000
@@ -1,9 +1,9 @@
-/* dictionary-list.c generated by valac 0.22.1, the Vala compiler
+/* dictionary-list.c generated by valac 0.24.0.131-42e78, the Vala compiler
  * generated from dictionary-list.vala, do not modify */
 
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -88,9 +88,9 @@
 void kkc_dictionary_list_clear (KkcDictionaryList* self);
 void kkc_dictionary_list_call (KkcDictionaryList* self, GType* type, KkcDictionaryListDictionaryCallback callback, void* callback_target);
 void kkc_dictionary_list_save (KkcDictionaryList* self);
-static KkcDictionaryCallbackReturn __lambda7_ (KkcDictionaryList* self, KkcDictionary* dictionary);
+static KkcDictionaryCallbackReturn __lambda9_ (KkcDictionaryList* self, KkcDictionary* dictionary);
 void kkc_dictionary_save (KkcDictionary* self, GError** error);
-static KkcDictionaryCallbackReturn ___lambda7__kkc_dictionary_list_dictionary_callback (KkcDictionary* dictionary, gpointer self);
+static KkcDictionaryCallbackReturn ___lambda9__kkc_dictionary_list_dictionary_callback (KkcDictionary* dictionary, gpointer self);
 KkcDictionaryList* kkc_dictionary_list_new (void);
 KkcDictionaryList* kkc_dictionary_list_construct (GType object_type);
 gint kkc_dictionary_list_get_size (KkcDictionaryList* self);
@@ -197,8 +197,6 @@
 			gboolean _tmp11_ = FALSE;
 			gboolean _tmp12_ = FALSE;
 			GType* _tmp13_ = NULL;
-			gboolean _tmp18_ = FALSE;
-			gboolean _tmp22_ = FALSE;
 			_tmp5_ = _dictionary_index;
 			_dictionary_index = _tmp5_ + 1;
 			_tmp6_ = _dictionary_index;
@@ -224,22 +222,20 @@
 				_tmp17_ = g_type_is_a (_tmp15_, *_tmp16_);
 				_tmp12_ = _tmp17_;
 			}
-			_tmp18_ = _tmp12_;
-			if (_tmp18_) {
-				KkcDictionaryListDictionaryCallback _tmp19_ = NULL;
-				void* _tmp19__target = NULL;
-				KkcDictionary* _tmp20_ = NULL;
-				KkcDictionaryCallbackReturn _tmp21_ = 0;
-				_tmp19_ = callback;
-				_tmp19__target = callback_target;
-				_tmp20_ = dictionary;
-				_tmp21_ = _tmp19_ (_tmp20_, _tmp19__target);
-				_tmp11_ = _tmp21_ == KKC_DICTIONARY_CALLBACK_RETURN_REMOVE;
+			if (_tmp12_) {
+				KkcDictionaryListDictionaryCallback _tmp18_ = NULL;
+				void* _tmp18__target = NULL;
+				KkcDictionary* _tmp19_ = NULL;
+				KkcDictionaryCallbackReturn _tmp20_ = 0;
+				_tmp18_ = callback;
+				_tmp18__target = callback_target;
+				_tmp19_ = dictionary;
+				_tmp20_ = _tmp18_ (_tmp19_, _tmp18__target);
+				_tmp11_ = _tmp20_ == KKC_DICTIONARY_CALLBACK_RETURN_REMOVE;
 			} else {
 				_tmp11_ = FALSE;
 			}
-			_tmp22_ = _tmp11_;
-			if (_tmp22_) {
+			if (_tmp11_) {
 				_g_object_unref0 (dictionary);
 				_g_object_unref0 (_dictionary_list);
 				return;
@@ -254,7 +250,7 @@
 /**
          * Save dictionaries on to disk.
          */
-static KkcDictionaryCallbackReturn __lambda7_ (KkcDictionaryList* self, KkcDictionary* dictionary) {
+static KkcDictionaryCallbackReturn __lambda9_ (KkcDictionaryList* self, KkcDictionary* dictionary) {
 	KkcDictionaryCallbackReturn result = 0;
 	GError * _inner_error_ = NULL;
 	g_return_val_if_fail (dictionary != NULL, 0);
@@ -262,7 +258,7 @@
 		KkcDictionary* _tmp0_ = NULL;
 		_tmp0_ = dictionary;
 		kkc_dictionary_save (_tmp0_, &_inner_error_);
-		if (_inner_error_ != NULL) {
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
 			goto __catch19_g_error;
 		}
 	}
@@ -280,7 +276,7 @@
 		_g_error_free0 (e);
 	}
 	__finally19:
-	if (_inner_error_ != NULL) {
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 		g_clear_error (&_inner_error_);
 		return 0;
@@ -290,16 +286,16 @@
 }
 
 
-static KkcDictionaryCallbackReturn ___lambda7__kkc_dictionary_list_dictionary_callback (KkcDictionary* dictionary, gpointer self) {
+static KkcDictionaryCallbackReturn ___lambda9__kkc_dictionary_list_dictionary_callback (KkcDictionary* dictionary, gpointer self) {
 	KkcDictionaryCallbackReturn result;
-	result = __lambda7_ (self, dictionary);
+	result = __lambda9_ ((KkcDictionaryList*) self, dictionary);
 	return result;
 }
 
 
 void kkc_dictionary_list_save (KkcDictionaryList* self) {
 	g_return_if_fail (self != NULL);
-	kkc_dictionary_list_call (self, NULL, ___lambda7__kkc_dictionary_list_dictionary_callback, self);
+	kkc_dictionary_list_call (self, NULL, ___lambda9__kkc_dictionary_list_dictionary_callback, self);
 }
 
 
@@ -344,7 +340,7 @@
 static void kkc_dictionary_list_instance_init (KkcDictionaryList * self) {
 	GeeArrayList* _tmp0_ = NULL;
 	self->priv = KKC_DICTIONARY_LIST_GET_PRIVATE (self);
-	_tmp0_ = gee_array_list_new (KKC_TYPE_DICTIONARY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL);
+	_tmp0_ = gee_array_list_new (KKC_TYPE_DICTIONARY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 	self->priv->dictionaries = (GeeList*) _tmp0_;
 }
 
 
=== modified file 'libkkc/dictionary-list.vala'
--- libkkc/dictionary-list.vala	2014-02-26 22:51:39 +0000
+++ libkkc/dictionary-list.vala	2014-10-01 15:12:30 +0000
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
=== modified file 'libkkc/dictionary.c'
--- libkkc/dictionary.c	2014-06-15 23:27:57 +0000
+++ libkkc/dictionary.c	2014-10-01 15:12:30 +0000
@@ -1,9 +1,9 @@
-/* dictionary.c generated by valac 0.22.1, the Vala compiler
+/* dictionary.c generated by valac 0.24.0.131-42e78, the Vala compiler
  * generated from dictionary.vala, do not modify */
 
 /*
- * Copyright (C) 2011-2013 Daiki Ueno <[e-mail]>
- * Copyright (C) 2011-2013 Red Hat, Inc.
+ * Copyright (C) 2011-2014 Daiki Ueno <[e-mail]>
+ * Copyright (C) 2011-2014 Red Hat, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -143,15 +143,13 @@
 	gboolean _tmp8_ = FALSE;
 	glong _tmp9_ = 0L;
 	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	glong _tmp14_ = 0L;
-	gboolean _tmp17_ = FALSE;
+	glong _tmp13_ = 0L;
+	glong _tmp16_ = 0L;
+	glong _tmp17_ = 0L;
 	glong _tmp18_ = 0L;
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	glong _tmp22_ = 0L;
-	gchar* _tmp23_ = NULL;
+	gchar* _tmp21_ = NULL;
 	g_return_val_if_fail (self != NULL, NULL);
 	_tmp0_ = strlen (self);
 	_tmp1_ = _tmp0_;
@@ -182,28 +180,26 @@
 	} else {
 		_tmp8_ = FALSE;