Cleanup to match new Swift compiler syntax.