Adapt to Kenji's changes.