Updated to latest modern Objective-C features.