swift/CDMigrationDemo: minor fixes