Update to run in Xcode 6.1+, mainly accounting for bailable initializers