ObjectiveC migrator. Minor clean up of my last patch.
No functional change.