Refactoring, part 17.