Refactoring, part 16.