Modernizing the code base for Xcode 6.