ObjC API clean-up.