Use standard naming
Hide deprecation warning (we know)

Also remove second if. Should that method not exist, we should throw rather than have undefined behavior.
Xcode 6 fixes

Tag 0.9.17.1