Updated too keep up with Swift language changes.