Updated so it still compiles in Xcode 4.