Semantic cleanups for objc client