Forgot to check in cocos2d-iphone refactoring!