Updating to Xcode 4.6, the compiler complained about a few things, so we're just dealing with them. We can more properly remedy this whenever we pull from upstream for the latest SDK.