changes made to support Swift changes in Xcode Beta 4 and 5.