Code refactoring for commit r257278.