iOS 7 deprecation related fixes
Fixed merge conflicts of id vs instancetype in operation initializers.