HADOOP-11321: More refactoring.