ObjectiveC migrator: Fixes a crash and makes couple
of harmless changes.