Fixing Apple after refactoring