Updated to work with latest (10.9/Xcode 5) compilers.