Changes to support auto-generation of objective-c skeletons