Swift syntax updates to resolve compile errors (6.1 6A1052d)