Merge with Objective-C.mode