More Swift porting.