Expanding refactoring, not compilable.