Norihiro,

Thank you for the patch.  It looks correct, but induces what looks like
unnecessary duplication.  Did you consider the attached variant?

Also, the affected code path seems not to be covered by any test.
Can you construct a test case that exercises this change?