More minor Swift changes.