Fixing types in refactoring.