Merge: Better Objective-C FFI and cleanup for OS X