[[ RefactorSyntax ]] more fixes to iOS refactoring